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..1fc62ab18
--- /dev/null
+++ b/.env.test.sample
@@ -0,0 +1,4 @@
+# Desired block time in seconds for the regtest network
+REGTEST_BLOCK_TIME=5
+# Use local file to store remote data in test
+BRIDGE_USE_LOCAL_FILE_DATA_STORE=true
\ No newline at end of file
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 000000000..a7a692c41
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,141 @@
+name: BitVM CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches: ["*"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  rustfmt:
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v5
+    - name: Run rustfmt
+      run: cargo fmt --all -- --check
+
+  clippy:
+    if: github.event.pull_request.draft == false
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v5
+    - 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
+    needs: rustfmt
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v5
+    - 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
+    needs: rustfmt
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v5
+
+    - 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
+    env:
+      LARGE_TESTS: >-
+        bn254::pairing::test::test_hinted_quad_miller_loop_with_c_wi
+        chunk::api::test::full_e2e_execution
+        chunk::api_runtime_utils::test::test_runtime_execution_looped
+        chunk::g16_runner_core::test::test_groth16
+        chunk::g16_runner_core::test::test_verify_pairing
+        groth16::test::test_hinted_groth16_verifier
+        groth16::test::test_hinted_groth16_verifier_small_public
+        hash::blake3::tests::test_blake3_randominputs
+        hash::blake3::tests::test_blake3_randominputs_multipleof64bytes
+    steps:
+    - uses: actions/checkout@v5
+
+    - 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: |
+        SKIP_ARGS=""
+        for test in $LARGE_TESTS; do
+          SKIP_ARGS="$SKIP_ARGS --skip $test"
+        done
+        cargo test -- --skip bridge:: --skip tests::test_final_circuit $SKIP_ARGS
+        cargo test -- --test-threads=1 $LARGE_TESTS
+  
+#  test_bridge:
+#    if: github.event.pull_request.draft == false
+#    timeout-minutes: 200
+#    needs: build
+#    runs-on: self-hosted
+#    steps:
+#    - uses: actions/checkout@v5
+#    
+#    - 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 b37f3a3fa..caf295d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ target/
 
 # Ignore .env files
 .env
+.env.test
 
 # Added by cargo
 
@@ -29,3 +30,11 @@ tmp
 
 # Bridge public and private files
 bridge_data/
+
+# Esplora regtest data
+nohup.out
+data_path
+esplora-bitcoin-regtest-data
+
+# test cache
+test_data/
diff --git a/.rustfmt.toml b/.rustfmt.toml
deleted file mode 100644
index 2e02686d2..000000000
--- a/.rustfmt.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-fn_single_line = true
-ignore = [
-    "src/utils/merkle.rs",
-]
-
-
diff --git a/Cargo.lock b/Cargo.lock
index 1262707cd..cb5f49bb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,32 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+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"
@@ -8,7 +34,7 @@ version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "gimli",
+ "gimli 0.31.1",
 ]
 
 [[package]]
@@ -19,9 +45,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -71,13 +97,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-chains"
-version = "0.1.47"
+version = "0.1.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470"
+checksum = "28e2652684758b0d9b389d248b209ed9fd9989ef489a550265fe4bb8454fe7eb"
 dependencies = [
- "alloy-primitives 0.8.14",
+ "alloy-primitives 0.8.25",
  "num_enum",
- "strum",
+ "strum 0.27.1",
 ]
 
 [[package]]
@@ -141,7 +167,7 @@ dependencies = [
  "itoa",
  "serde",
  "serde_json",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -154,7 +180,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde",
  "c-kzg",
- "derive_more 0.99.18",
+ "derive_more 0.99.20",
  "k256",
  "once_cell",
  "serde",
@@ -240,13 +266,13 @@ dependencies = [
  "bytes",
  "cfg-if",
  "const-hex",
- "derive_more 0.99.18",
+ "derive_more 0.99.20",
  "hex-literal",
  "itoa",
  "k256",
  "keccak-asm",
  "proptest",
- "rand",
+ "rand 0.8.5",
  "ruint",
  "serde",
  "tiny-keccak",
@@ -254,15 +280,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.8.14"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db948902dfbae96a73c2fbf1f7abec62af034ab883e4c777c3fd29702bd6e2c"
+checksum = "8c77490fe91a0ce933a1f219029521f20fc28c2c0ca95d53fa4da9c00b8d9d4e"
 dependencies = [
  "bytes",
  "cfg-if",
  "const-hex",
- "derive_more 1.0.0",
- "hex-literal",
+ "derive_more 2.0.1",
  "itoa",
  "paste",
  "ruint",
@@ -295,9 +320,9 @@ dependencies = [
  "dashmap",
  "futures",
  "futures-utils-wasm",
- "lru",
+ "lru 0.12.5",
  "pin-project",
- "reqwest 0.12.9",
+ "reqwest 0.12.15",
  "serde",
  "serde_json",
  "tokio",
@@ -320,15 +345,15 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-rlp"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f"
+checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
  "alloy-rlp-derive",
  "arrayvec",
@@ -337,13 +362,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp-derive"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f"
+checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -361,12 +386,12 @@ dependencies = [
  "alloy-transport-ws",
  "futures",
  "pin-project",
- "reqwest 0.12.9",
+ "reqwest 0.12.15",
  "serde",
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -396,7 +421,7 @@ dependencies = [
  "alloy-rpc-types-eth",
  "alloy-serde",
  "jsonwebtoken",
- "rand",
+ "rand 0.8.5",
  "serde",
  "thiserror 1.0.69",
 ]
@@ -414,7 +439,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde",
  "alloy-sol-types",
- "itertools",
+ "itertools 0.13.0",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -457,7 +482,7 @@ dependencies = [
  "alloy-signer",
  "async-trait",
  "k256",
- "rand",
+ "rand 0.8.5",
  "thiserror 1.0.69",
 ]
 
@@ -472,7 +497,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -489,7 +514,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "syn-solidity",
  "tiny-keccak",
 ]
@@ -507,7 +532,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.90",
+ "syn 2.0.101",
  "syn-solidity",
 ]
 
@@ -518,7 +543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
 dependencies = [
  "serde",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -548,7 +573,7 @@ dependencies = [
  "serde_json",
  "thiserror 1.0.69",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -561,9 +586,9 @@ checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
- "reqwest 0.12.9",
+ "reqwest 0.12.15",
  "serde_json",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -596,8 +621,8 @@ dependencies = [
  "alloy-pubsub",
  "alloy-transport",
  "futures",
- "http 1.1.0",
- "rustls 0.23.19",
+ "http 1.3.1",
+ "rustls 0.23.27",
  "serde_json",
  "tokio",
  "tokio-tungstenite",
@@ -661,19 +686,32 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+dependencies = [
+ "backtrace",
+]
+
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
 
 [[package]]
 name = "arc-swap"
@@ -684,29 +722,61 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 [[package]]
 name = "ark-bn254"
 version = "0.4.0"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
 dependencies = [
- "ark-ec",
+ "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-r1cs-std",
+ "ark-std 0.5.0",
+]
+
 [[package]]
 name = "ark-crypto-primitives"
 version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/crypto-primitives#b13983815e5b3a0fbeed0e7da0edec751beac270"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56"
 dependencies = [
- "ahash",
- "ark-crypto-primitives-macros",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
- "ark-relations",
+ "ark-relations 0.4.0",
  "ark-serialize 0.4.2",
- "ark-snark",
+ "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",
+ "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",
@@ -715,29 +785,48 @@ dependencies = [
 
 [[package]]
 name = "ark-crypto-primitives-macros"
-version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/crypto-primitives#b13983815e5b3a0fbeed0e7da0edec751beac270"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e89fe77d1f0f4fe5b96dfc940923d88d17b6a773808124f21e764dfb063c6a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
 dependencies = [
- "ahash",
  "ark-ff 0.4.2",
- "ark-poly",
+ "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",
- "num-bigint",
+ "hashbrown 0.15.3",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-traits",
  "rayon",
@@ -755,7 +844,7 @@ dependencies = [
  "ark-serialize 0.3.0",
  "ark-std 0.3.0",
  "derivative",
- "num-bigint",
+ "num-bigint 0.4.6",
  "num-traits",
  "paste",
  "rustc_version 0.3.3",
@@ -765,17 +854,38 @@ dependencies = [
 [[package]]
 name = "ark-ff"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+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",
- "num-bigint",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
  "num-traits",
  "paste",
  "rayon",
@@ -795,10 +905,21 @@ dependencies = [
 [[package]]
 name = "ark-ff-asm"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+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.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -807,7 +928,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20"
 dependencies = [
- "num-bigint",
+ "num-bigint 0.4.6",
  "num-traits",
  "quote",
  "syn 1.0.109",
@@ -816,49 +937,111 @@ dependencies = [
 [[package]]
 name = "ark-ff-macros"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+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",
+ "num-bigint 0.4.6",
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "ark-groth16"
 version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/groth16#16ac1dd387fe5dc89b6fc1a1cf87c9fdcfd8493f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc"
 dependencies = [
- "ark-crypto-primitives",
- "ark-ec",
+ "ark-crypto-primitives 0.4.0",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
- "ark-poly",
- "ark-relations",
+ "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",
+ "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 = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
 dependencies = [
- "ahash",
  "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",
+ "hashbrown 0.15.3",
  "rayon",
 ]
 
+[[package]]
+name = "ark-r1cs-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-std 0.5.0",
+ "educe",
+ "num-bigint 0.4.6",
+ "num-integer",
+ "num-traits",
+ "tracing",
+]
+
 [[package]]
 name = "ark-relations"
 version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/snark/#202b9e02b808d1d15823298b8ac16f5c54ae4ef6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
 dependencies = [
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
@@ -866,6 +1049,18 @@ dependencies = [
  "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"
@@ -879,37 +1074,75 @@ dependencies = [
 [[package]]
 name = "ark-serialize"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
 dependencies = [
- "ark-serialize-derive",
+ "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",
+ "num-bigint 0.4.6",
  "rayon",
 ]
 
 [[package]]
 name = "ark-serialize-derive"
 version = "0.4.2"
-source = "git+https://github.com/chainwayxyz/algebra/?branch=new-ate-loop#ac23fde284ca4d7ede298018f7866ce8ce64467f"
+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.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "ark-snark"
 version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/snark/#202b9e02b808d1d15823298b8ac16f5c54ae4ef6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
 dependencies = [
  "ark-ff 0.4.2",
- "ark-relations",
+ "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"
@@ -917,7 +1150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -925,13 +1158,29 @@ name = "ark-std"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
+[[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",
+ "rand 0.8.5",
  "rayon",
 ]
 
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -969,14 +1218,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
+ "pin-project-lite",
  "slab",
 ]
 
@@ -1008,7 +1258,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix",
+ "rustix 0.38.44",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -1020,7 +1270,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.0",
  "event-listener-strategy",
  "pin-project-lite",
 ]
@@ -1039,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "async-std"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
+checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
 dependencies = [
  "async-channel 1.9.0",
  "async-global-executor",
@@ -1082,7 +1332,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1093,13 +1343,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1113,6 +1363,15 @@ dependencies = [
  "rustc_version 0.4.1",
 ]
 
+[[package]]
+name = "atomic-polyfill"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -1121,15 +1380,21 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "auto_impl"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
+[[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"
@@ -1154,9 +1419,9 @@ checksum = "d5b3469636cdf8543cceab175efca534471f36eee12fb8374aba00eb5e7e7f8a"
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -1164,11 +1429,34 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "aws-runtime"
-version = "1.4.3"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
+checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -1183,7 +1471,6 @@ dependencies = [
  "fastrand",
  "http 0.2.12",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "tracing",
@@ -1192,9 +1479,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.63.0"
+version = "1.86.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43850204a109a5eea1ea93951cf0440268cef98b0d27dfef4534949e23735f7"
+checksum = "0303d28521eae1dbf1bf29e772029204cf9e126da7aa763e5391ff2131bcc2ac"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1214,9 +1501,9 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
- "lru",
- "once_cell",
+ "lru 0.12.5",
  "percent-encoding",
  "regex-lite",
  "sha2",
@@ -1226,9 +1513,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.5"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
+checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -1241,8 +1528,7 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
- "http 1.1.0",
- "once_cell",
+ "http 1.3.1",
  "p256",
  "percent-encoding",
  "ring",
@@ -1255,9 +1541,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.1"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
+checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -1266,15 +1552,14 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-checksums"
-version = "0.60.13"
+version = "0.63.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795"
+checksum = "d2f77a921dbd2c78ebe70726799787c1d110a2245dd65e39b20923dfdfb2deee"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes",
- "crc32c",
- "crc32fast",
+ "crc-fast",
  "hex",
  "http 0.2.12",
  "http-body 0.4.6",
@@ -1287,9 +1572,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.5"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
+checksum = "7c45d3dddac16c5c59d553ece225a88870cf81b7b813c9cc17b78cf4685eac7a"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -1298,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.11"
+version = "0.62.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
+checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -1309,61 +1594,95 @@ dependencies = [
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "pin-utils",
  "tracing",
 ]
 
+[[package]]
+name = "aws-smithy-http-client"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e44697a9bded898dcd0b1cb997430d949b87f4f8940d91023ae9062bf218250"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "h2 0.4.10",
+ "http 0.2.12",
+ "http 1.3.1",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper 1.6.0",
+ "hyper-rustls 0.24.2",
+ "hyper-rustls 0.27.5",
+ "hyper-util",
+ "pin-project-lite",
+ "rustls 0.21.12",
+ "rustls 0.23.27",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "tokio",
+ "tower 0.5.2",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-json"
-version = "0.60.7"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
+checksum = "92144e45819cae7dc62af23eac5a038a58aa544432d2102609654376a900bd07"
 dependencies = [
  "aws-smithy-types",
 ]
 
+[[package]]
+name = "aws-smithy-observability"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393"
+dependencies = [
+ "aws-smithy-runtime-api",
+]
+
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.3"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
+checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
+ "aws-smithy-http-client",
+ "aws-smithy-observability",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "fastrand",
- "h2",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
- "httparse",
- "hyper 0.14.31",
- "hyper-rustls",
- "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "bytes",
  "http 0.2.12",
- "http 1.1.0",
+ "http 1.3.1",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -1372,16 +1691,16 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.9"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
+checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3"
 dependencies = [
  "base64-simd",
  "bytes",
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
- "http 1.1.0",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
  "http-body-util",
@@ -1407,9 +1726,9 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "1.3.3"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef"
+checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -1421,15 +1740,15 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
- "addr2line",
+ "addr2line 0.24.2",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object",
+ "object 0.36.7",
  "rustc-demangle",
  "windows-targets 0.52.6",
 ]
@@ -1447,20 +1766,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
-name = "base58check"
+name = "base58ck"
 version = "0.1.0"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+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"
@@ -1485,9 +1799,9 @@ dependencies = [
 
 [[package]]
 name = "base64ct"
-version = "1.6.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 
 [[package]]
 name = "bech32"
@@ -1501,27 +1815,84 @@ 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 = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.9.1",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn 2.0.101",
+ "which",
+]
+
 [[package]]
 name = "bit-set"
-version = "0.5.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.6.3"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitcode"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf300f4aa6e66f3bdff11f1236a88c622fe47ea814524792240b4d554d9858ee"
+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 = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "bitcoin"
-version = "0.31.0"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+version = "0.32.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8929a18b8e33ea6b3c09297b687baaa71fb1b97353243a3f1029fad5c59c5b"
 dependencies = [
- "base58check",
+ "base58ck",
  "bech32",
  "bitcoin-internals",
  "bitcoin-io",
@@ -1535,24 +1906,25 @@ dependencies = [
 
 [[package]]
 name = "bitcoin-internals"
-version = "0.2.0"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+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.2"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+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?branch=StructuredScript#226956315350b52df0d8a1608530e0a965f405e1"
+version = "0.4.0"
+source = "git+https://github.com/BitVM/rust-bitcoin-script#519088c7e5e89769910dabcb1b663fa48a21a645"
 dependencies = [
  "bitcoin",
- "lazy_static",
  "script-macro",
  "stdext",
 ]
@@ -1560,23 +1932,22 @@ dependencies = [
 [[package]]
 name = "bitcoin-script-stack"
 version = "0.0.1"
-source = "git+https://github.com/BitVM/rust-bitcoin-script-stack?branch=bitvm#ac312c4d02dd65b6fe54e96b4c450fa33ef10b6f"
+source = "git+https://github.com/BitVM/rust-bitcoin-script-stack#643c5f1a44af448274849c01a5ae7fbdd54d8213"
 dependencies = [
  "bitcoin",
  "bitcoin-script",
  "bitcoin-scriptexec",
- "hex",
 ]
 
 [[package]]
 name = "bitcoin-scriptexec"
 version = "0.0.0"
-source = "git+https://github.com/BitVM/rust-bitcoin-scriptexec/#5c88966fa6ed718cd5a8a8b4a0722dd1f4fad5fb"
+source = "git+https://github.com/BitVM/rust-bitcoin-scriptexec#b24608bff855ea8932ae236c7a04f13f730ab9f8"
 dependencies = [
  "bitcoin",
  "clap",
  "console_error_panic_hook",
- "getrandom",
+ "getrandom 0.2.16",
  "lazy_static",
  "serde",
  "serde-wasm-bindgen",
@@ -1586,8 +1957,9 @@ dependencies = [
 
 [[package]]
 name = "bitcoin-units"
-version = "0.1.0"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
 dependencies = [
  "bitcoin-internals",
  "serde",
@@ -1595,8 +1967,9 @@ dependencies = [
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.13.0"
-source = "git+https://github.com/rust-bitcoin/rust-bitcoin?branch=bitvm#48efda928ae569a8fdee4ff5cc951646ab280205"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
 dependencies = [
  "bitcoin-io",
  "hex-conservative",
@@ -1611,9 +1984,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bitvec"
@@ -1631,50 +2004,46 @@ dependencies = [
 name = "bitvm"
 version = "0.1.0"
 dependencies = [
- "alloy",
- "ark-bn254",
- "ark-crypto-primitives",
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-groth16",
- "ark-relations",
- "ark-std 0.4.0",
- "async-trait",
- "aws-sdk-s3",
+ "ark-bn254 0.5.0",
+ "ark-crypto-primitives 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",
- "clap",
  "colored",
- "dotenv",
- "esplora-client",
- "futures",
- "hex",
- "lazy_static",
- "musig2",
- "num-bigint",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
  "num-traits",
- "once_cell",
- "openssh",
- "openssh-sftp-client",
  "paste",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "regex",
  "serde",
  "serde_json",
- "serial_test",
  "sha2",
- "strum",
- "strum_macros",
- "suppaftp",
- "tokio",
- "toml",
  "tqdm",
 ]
 
+[[package]]
+name = "bitvm-fuzz"
+version = "0.0.0"
+dependencies = [
+ "arbitrary",
+ "bitcoin",
+ "bitcoin-script",
+ "bitcoin-script-stack",
+ "bitvm",
+ "blake3",
+ "libfuzzer-sys",
+]
+
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -1686,9 +2055,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1697,6 +2066,12 @@ dependencies = [
  "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"
@@ -1721,9 +2096,9 @@ dependencies = [
 
 [[package]]
 name = "blst"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874"
+checksum = "47c79a94619fade3c0b887670333513a67ac28a6a7e653eb260bf0d4103db38d"
 dependencies = [
  "cc",
  "glob",
@@ -1731,17 +2106,108 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "bridge"
+version = "0.1.0"
+dependencies = [
+ "alloy",
+ "ark-bn254 0.5.0",
+ "ark-crypto-primitives 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",
+ "derive_more 2.0.1",
+ "dotenv",
+ "esplora-client",
+ "futures",
+ "human_bytes",
+ "itertools 0.13.0",
+ "lru 0.13.0",
+ "musig2",
+ "num-traits",
+ "openssh",
+ "openssh-sftp-client",
+ "rand 0.8.5",
+ "regex",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "sha2",
+ "strum 0.27.1",
+ "strum_macros 0.27.1",
+ "suppaftp",
+ "tokio",
+ "toml 0.5.11",
+ "zstd",
+]
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byte-slice-cast"
-version = "1.2.2"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
+
+[[package]]
+name = "bytemuck"
+version = "1.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "byteorder"
@@ -1751,9 +2217,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 dependencies = [
  "serde",
 ]
@@ -1783,38 +2249,98 @@ dependencies = [
  "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.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.26",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "cc"
-version = "1.2.2"
+version = "1.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
 dependencies = [
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[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.38"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.52.6",
+ "windows-link",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1822,9 +2348,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1834,21 +2360,36 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.3"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cobs"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "colorchoice"
@@ -1858,12 +2399,12 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1898,9 +2439,9 @@ dependencies = [
 
 [[package]]
 name = "const-hex"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c"
+checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1915,6 +2456,26 @@ 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"
@@ -1937,6 +2498,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1944,60 +2515,106 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
-name = "cpufeatures"
-version = "0.2.16"
+name = "core-graphics-types"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
 [[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"
+name = "cpp_demangle"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
+name = "cpufeatures"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "libc",
 ]
 
 [[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
+name = "crc"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 dependencies = [
- "crossbeam-utils",
+ "crc-catalog",
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
+name = "crc-catalog"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
-name = "crossterm"
-version = "0.25.0"
+name = "crc-fast"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add8d3a4c789d77eeb0f0e3c1035f73610d017f9047e87db94f89c02a56d8fef"
+dependencies = [
+ "cc",
+ "crc",
+ "digest 0.10.7",
+ "libc",
+ "rand 0.9.1",
+ "regex",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
+[[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-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 = [
@@ -2022,9 +2639,9 @@ dependencies = [
 
 [[package]]
 name = "crunchy"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "crypto-bigint"
@@ -2033,11 +2650,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
  "generic-array",
- "rand_core",
+ "rand_core 0.6.4",
  "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.16",
+ "subtle",
+]
+
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -2045,7 +2671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
@@ -2060,6 +2686,41 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -2075,9 +2736,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "der"
@@ -2091,9 +2752,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "zeroize",
@@ -2101,9 +2762,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -2119,6 +2780,48 @@ dependencies = [
  "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.101",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+dependencies = [
+ "derive_builder_core",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "derive_destructure2"
 version = "0.1.3"
@@ -2127,40 +2830,40 @@ checksum = "64b697ac90ff296f0fc031ee5a61c7ac31fb9fff50e3fb32873b09223613fc0c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_more"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "unicode-xid",
 ]
 
@@ -2185,6 +2888,36 @@ dependencies = [
  "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"
@@ -2193,9 +2926,15 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
+[[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"
@@ -2208,6 +2947,26 @@ 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 0.8.5",
+ "reqwest 0.12.15",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
 [[package]]
 name = "dunce"
 version = "1.0.5"
@@ -2232,7 +2991,7 @@ version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.9",
+ "der 0.7.10",
  "digest 0.10.7",
  "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
@@ -2249,14 +3008,20 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "elf"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
 
 [[package]]
 name = "elliptic-curve"
@@ -2272,7 +3037,7 @@ dependencies = [
  "generic-array",
  "group 0.12.1",
  "pkcs8 0.9.0",
- "rand_core",
+ "rand_core 0.6.4",
  "sec1 0.3.0",
  "subtle",
  "zeroize",
@@ -2287,16 +3052,28 @@ dependencies = [
  "base16ct 0.2.0",
  "crypto-bigint 0.5.5",
  "digest 0.10.7",
- "ff 0.13.0",
+ "ff 0.13.1",
  "generic-array",
  "group 0.13.0",
  "pkcs8 0.10.2",
- "rand_core",
+ "rand_core 0.6.4",
  "sec1 0.7.3",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -2306,6 +3083,26 @@ 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.101",
+]
+
 [[package]]
 name = "enum-ordinalize"
 version = "4.3.0"
@@ -2323,20 +3120,30 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+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 = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
+dependencies = [
+ "serde",
+ "typeid",
+]
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2344,8 +3151,8 @@ dependencies = [
 
 [[package]]
 name = "esplora-client"
-version = "0.7.0"
-source = "git+https://github.com/BitVM/rust-esplora-client#3d61a8bf75fd4cac7eab454243a7daefe27230f9"
+version = "0.11.0"
+source = "git+https://github.com/BitVM/rust-esplora-client#7befb9147b69126edaad8b9dbd0b13259f2e9ea0"
 dependencies = [
  "bitcoin",
  "hex-conservative",
@@ -2353,6 +3160,7 @@ dependencies = [
  "minreq",
  "reqwest 0.11.27",
  "serde",
+ "tokio",
 ]
 
 [[package]]
@@ -2363,9 +3171,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -2374,19 +3182,25 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.3.1",
+ "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.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fastrlp"
@@ -2399,26 +3213,78 @@ dependencies = [
  "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",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "ff"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
 dependencies = [
- "rand_core",
+ "bitvec",
+ "byteorder",
+ "ff_derive",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
+[[package]]
+name = "ff_derive"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f10d12652036b0e99197587c6ba87a8fc3031986499973c030d8b44fcc151b60"
+dependencies = [
+ "addchain",
+ "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-literal",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "final-spv-circuit"
+version = "0.1.0"
+dependencies = [
+ "risc0-binfmt 2.0.1",
+ "risc0-build",
+]
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -2426,11 +3292,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
  "static_assertions",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -2439,9 +3315,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "foreign-types"
@@ -2449,7 +3325,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "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.101",
 ]
 
 [[package]]
@@ -2458,6 +3355,12 @@ 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"
@@ -2467,6 +3370,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2523,9 +3432,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2542,7 +3451,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2594,28 +3503,58 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
+[[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.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b46b9ca4690308844c644e7c634d68792467260e051c8543e0c7871662b3ba7"
+
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gloo-timers"
@@ -2636,7 +3575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff 0.12.1",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -2646,8 +3585,8 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
- "ff 0.13.0",
- "rand_core",
+ "ff 0.13.1",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -2670,23 +3609,107 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.3.1",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
+[[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"
+dependencies = [
+ "ahash",
+]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "header-chain"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "borsh",
+ "crypto-bigint 0.5.5",
+ "hex-literal",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "header-chain-circuit"
+version = "0.1.0"
+dependencies = [
+ "risc0-binfmt 2.0.1",
+ "risc0-build",
+]
+
+[[package]]
+name = "heapless"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
+dependencies = [
+ "atomic-polyfill",
+ "hash32",
+ "rustc_version 0.4.1",
+ "serde",
+ "spin",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2744,6 +3767,15 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -2757,9 +3789,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -2784,27 +3816,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.3.1",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
- "http 1.1.0",
+ "futures-core",
+ "http 1.3.1",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
@@ -2812,17 +3844,26 @@ 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.31"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
@@ -2838,14 +3879,15 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "h2 0.4.10",
+ "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
  "itoa",
@@ -2863,14 +3905,33 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "log",
  "rustls 0.21.12",
- "rustls-native-certs",
+ "rustls-native-certs 0.6.3",
  "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.3.1",
+ "hyper 1.6.0",
+ "hyper-util",
+ "rustls 0.23.27",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.2",
+ "tower-service",
+ "webpki-roots 0.26.11",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -2878,7 +3939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -2892,7 +3953,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.5.1",
+ "hyper 1.6.0",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2902,16 +3963,17 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.3.1",
  "http-body 1.0.1",
- "hyper 1.5.1",
+ "hyper 1.6.0",
+ "libc",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2921,14 +3983,15 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -2944,21 +4007,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2967,31 +4031,11 @@ dependencies = [
  "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"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -2999,66 +4043,59 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
+name = "ident_case"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
@@ -3073,9 +4110,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -3098,24 +4135,30 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
+[[package]]
+name = "include_bytes_aligned"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee796ad498c8d9a1d68e477df8f754ed784ef875de1414ebdaf169f70a6a784"
+
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
 name = "interprocess"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb"
+checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
 dependencies = [
  "doctest-file",
  "futures-core",
@@ -3126,11 +4169,20 @@ dependencies = [
  "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.10.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -3138,6 +4190,33 @@ 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.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -3147,17 +4226,36 @@ 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.14"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jobserver"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+dependencies = [
+ "getrandom 0.3.3",
+ "libc",
+]
 
 [[package]]
 name = "js-sys"
-version = "0.3.74"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -3165,11 +4263,11 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "9.3.0"
+version = "9.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "js-sys",
  "pem",
  "ring",
@@ -3221,9 +4319,9 @@ dependencies = [
 
 [[package]]
 name = "lazy-regex"
-version = "3.3.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda"
+checksum = "60c7310b93682b36b98fa7ea4de998d3463ccbebd94d935d6b48ba5b6ffa7126"
 dependencies = [
  "lazy-regex-proc_macros",
  "once_cell",
@@ -3232,14 +4330,14 @@ dependencies = [
 
 [[package]]
 name = "lazy-regex-proc_macros"
-version = "3.3.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163"
+checksum = "4ba01db5ef81e17eb10a5e0f2109d1b3a3e29bac3070fdbd7d156bf7dbd206a1"
 dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3247,30 +4345,75 @@ name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.172"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+
+[[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 = "libloading"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.53.0",
+]
 
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.9.1",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
@@ -3284,9 +4427,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
  "value-bag",
 ]
@@ -3297,17 +4440,120 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
-name = "md-5"
-version = "0.10.6"
+name = "lru"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "cfg-if",
- "digest 0.10.7",
+ "hashbrown 0.15.3",
+]
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[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 = "malachite"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fbdf9cb251732db30a7200ebb6ae5d22fe8e11397364416617d2c2cf0c51cb5"
+dependencies = [
+ "malachite-base",
+ "malachite-float",
+ "malachite-nz",
+ "malachite-q",
+]
+
+[[package]]
+name = "malachite-base"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ea0ed76adf7defc1a92240b5c36d5368cfe9251640dcce5bd2d0b7c1fd87aeb"
+dependencies = [
+ "hashbrown 0.14.5",
+ "itertools 0.11.0",
+ "libm",
+ "ryu",
+]
+
+[[package]]
+name = "malachite-float"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9d20db1c73759c1377db7b27575df6f2eab7368809dd62c0a715dc1bcc39f7"
+dependencies = [
+ "itertools 0.11.0",
+ "malachite-base",
+ "malachite-nz",
+ "malachite-q",
+]
+
+[[package]]
+name = "malachite-nz"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34a79feebb2bc9aa7762047c8e5495269a367da6b5a90a99882a0aeeac1841f7"
+dependencies = [
+ "itertools 0.11.0",
+ "libm",
+ "malachite-base",
+]
+
+[[package]]
+name = "malachite-q"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f235d5747b1256b47620f5640c2a17a88c7569eebdf27cd9cb130e1a619191"
+dependencies = [
+ "itertools 0.11.0",
+ "malachite-base",
+ "malachite-nz",
+]
+
+[[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.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
+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]]
@@ -3316,6 +4562,15 @@ 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"
@@ -3324,32 +4579,53 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
  "byteorder",
  "keccak",
- "rand_core",
+ "rand_core 0.6.4",
  "zeroize",
 ]
 
+[[package]]
+name = "metal"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+dependencies = [
+ "bitflags 2.9.1",
+ "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 = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "minreq"
-version = "2.12.0"
+version = "2.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0"
+checksum = "f0d2aaba477837b46ec1289588180fabfccf0c3b1d1a0c6b1866240cd6cd5ce9"
 dependencies = [
- "base64 0.12.3",
+ "base64 0.22.1",
  "log",
  "serde",
  "serde_json",
@@ -3363,7 +4639,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -3374,20 +4650,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "musig2"
-version = "0.0.11"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed08befaac75bfb31ca5e87678c4e8490bcd21d0c98ccb4f12f4065a7567e83"
+checksum = "c89bee285da6010ad76c3467c4de8265bb4fa46fba0017df95ae55cad4436528"
 dependencies = [
  "base16ct 0.2.0",
  "hmac",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "secp",
  "secp256k1",
  "serde",
@@ -3398,9 +4674,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -3408,11 +4684,43 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "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 = "no_std_strings"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5b0c77c1b780822bc749a33e39aeb2c07584ab93332303babeabb645298a76e"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "non-zero-byte-slice"
 version = "0.1.0"
@@ -3422,6 +4730,17 @@ 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"
@@ -3430,7 +4749,16 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
- "rand",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
 ]
 
 [[package]]
@@ -3447,7 +4775,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3496,23 +4824,52 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
+]
+
+[[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.5"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssh"
@@ -3532,9 +4889,9 @@ dependencies = [
 
 [[package]]
 name = "openssh-mux-client"
-version = "0.17.6"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d091692d0a7d9035a3cdc5f8c3572abe401e64e30eac5404e517fb54e554c9bc"
+checksum = "d83f349e6427c6159fee16ec3dd8fa995cc25d4f5498855836d8666b9c6a8b75"
 dependencies = [
  "cfg-if",
  "non-zero-byte-slice",
@@ -3555,7 +4912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9879168afb48a235200e30d93df320b7191568cda8621df02f145c1c0f1af95a"
 dependencies = [
  "ssh_format_error",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -3615,7 +4972,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9c862e0c56553146306507f55958c11ff554e02c46de287e6976e50d815b350"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "num-derive",
  "num-traits",
  "openssh-sftp-protocol-error",
@@ -3631,19 +4988,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b54df62ccfd9a7708a83a9d60c46293837e478f9f4c0829360dcfa60ede8d2"
 dependencies = [
  "serde",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
  "vec-strings",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -3658,20 +5015,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
 dependencies = [
  "cc",
  "libc",
@@ -3679,11 +5036,17 @@ dependencies = [
  "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.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "p256"
@@ -3698,13 +5061,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.7.0"
+version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590"
+checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa"
 dependencies = [
  "arrayvec",
  "bitvec",
  "byte-slice-cast",
+ "const_format",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
  "rustversion",
@@ -3713,14 +5077,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.7.0"
+version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b"
+checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3760,9 +5124,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pem"
-version = "3.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
 dependencies = [
  "base64 0.22.1",
  "serde",
@@ -3776,12 +5140,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.14"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
 dependencies = [
  "memchr",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "ucd-trie",
 ]
 
@@ -3797,29 +5161,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.7"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.7"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -3854,15 +5218,15 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.9",
+ "der 0.7.10",
  "spki 0.7.3",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "polling"
@@ -3874,11 +5238,48 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
- "rustix",
+ "rustix 0.38.44",
  "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 = "postcard"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "heapless",
+ "serde",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -3887,13 +5288,23 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -3907,9 +5318,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
  "toml_edit",
 ]
@@ -3940,26 +5351,26 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -3968,73 +5379,230 @@ dependencies = [
 ]
 
 [[package]]
-name = "quick-error"
-version = "1.2.3"
+name = "prost"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
 
 [[package]]
-name = "quote"
-version = "1.0.37"
+name = "prost-derive"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
+ "anyhow",
+ "itertools 0.14.0",
  "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[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"
+name = "prover"
+version = "0.1.0"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
+ "bitcoin",
+ "blake3",
+ "borsh",
+ "crypto-bigint 0.5.2",
+ "final-spv",
+ "header-chain",
+ "hex-conservative",
+ "hex-literal",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "risc0-binfmt 2.0.1",
+ "risc0-circuit-recursion",
+ "risc0-groth16 1.2.6",
+ "risc0-zkp 2.0.1",
+ "risc0-zkvm",
+ "serde_json",
+ "sha2",
+ "tempfile",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.3.1"
+name = "puffin"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "fa9dae7b05c02ec1a6bc9bcf20d8bc64a7dcbf57934107902a872014899b741f"
 dependencies = [
- "ppv-lite86",
- "rand_core",
+ "anyhow",
+ "byteorder",
+ "cfg-if",
+ "itertools 0.10.5",
+ "once_cell",
+ "parking_lot",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "quick-error"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
-name = "rand_xorshift"
-version = "0.3.0"
+name = "quinn"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
 dependencies = [
- "rand_core",
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.27",
+ "socket2",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+ "web-time",
 ]
 
 [[package]]
-name = "rayon"
-version = "1.10.0"
+name = "quinn-proto"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
 dependencies = [
- "either",
- "rayon-core",
+ "bytes",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.1",
+ "ring",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.27",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.12",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[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 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[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 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[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]]
@@ -4055,11 +5623,22 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+dependencies = [
+ "bitflags 2.9.1",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "bitflags 2.6.0",
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4108,10 +5687,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -4123,94 +5702,524 @@ dependencies = [
  "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",
+ "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.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "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.27",
+ "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 0.26.11",
+ "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.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ringbuffer"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53"
+
+[[package]]
+name = "risc0-binfmt"
+version = "1.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c37f3babf129daf199c4368030f3592365654b827eaf758d525b2e08f07765"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "elf",
+ "risc0-zkp 1.2.6",
+ "risc0-zkvm-platform 1.2.6",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-binfmt"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fe7599ac55ad77515608ec42a9727001559fe4f579c533cb7c973b54800c05"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "derive_more 2.0.1",
+ "elf",
+ "lazy_static",
+ "postcard",
+ "risc0-zkp 2.0.1",
+ "risc0-zkvm-platform 2.0.2",
+ "semver 1.0.26",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-build"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31d104165340cba919a3dac26c4be7da04b20b941601a7ad50c04834c4d26de5"
+dependencies = [
+ "anyhow",
+ "cargo_metadata",
+ "derive_builder",
+ "dirs",
+ "docker-generate",
+ "hex",
+ "risc0-binfmt 2.0.1",
+ "risc0-zkos-v1compat",
+ "risc0-zkp 2.0.1",
+ "risc0-zkvm-platform 2.0.2",
+ "rzup",
+ "semver 1.0.26",
+ "serde",
+ "serde_json",
+ "stability",
+ "tempfile",
+]
+
+[[package]]
+name = "risc0-build-kernel"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cc3029ee7a4103aa176346f85431f1aa5193ea4025844417fcf1591f66299d4"
+dependencies = [
+ "cc",
+ "directories",
+ "glob",
+ "hex",
+ "rayon",
+ "sha2",
+ "tempfile",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd8acfc84307ed1be64cf9fefc390963fc22b2865d027f03405977a0cfa9747"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "cfg-if",
+ "keccak",
+ "paste",
+ "rayon",
+ "risc0-binfmt 2.0.1",
+ "risc0-circuit-keccak-sys",
+ "risc0-circuit-recursion",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+ "risc0-zkp 2.0.1",
+ "tracing",
+ "xz2",
+]
+
+[[package]]
+name = "risc0-circuit-keccak-sys"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25d00769a0f855d4973e8a85dbffe6e13889ca6a4703cf98d0a2976bdc2be17"
+dependencies = [
+ "cc",
+ "derive_more 2.0.1",
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd1514e94440e2da301f48d345e1937b315147f58c5dc4992feb045324651d"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "cfg-if",
+ "downloader",
+ "hex",
+ "lazy-regex",
+ "metal",
+ "rand 0.8.5",
+ "rayon",
+ "risc0-circuit-recursion-sys",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+ "risc0-zkp 2.0.1",
+ "serde",
+ "sha2",
+ "tracing",
+ "zip",
+]
+
+[[package]]
+name = "risc0-circuit-recursion-sys"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a7f8aee9b6b299fc5c3259a1a6e00a49a17dfd55811e90070840a887b113645"
+dependencies = [
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23f6ed144d8b8f93c4a6096e3dd90f9dcbd91eff83eae690a72fd6e640760b94"
+dependencies = [
+ "anyhow",
+ "auto_ops",
+ "bit-vec",
+ "bytemuck",
+ "byteorder",
+ "cfg-if",
+ "derive_more 2.0.1",
+ "enum-map",
+ "malachite",
+ "num-derive",
+ "num-traits",
+ "paste",
+ "postcard",
+ "rand 0.8.5",
+ "rayon",
+ "ringbuffer",
+ "risc0-binfmt 2.0.1",
+ "risc0-circuit-rv32im-sys",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+ "risc0-zkp 2.0.1",
+ "serde",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im-sys"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3904bb2fb2d26f96dd8dea5c5fcd7b86efd7e6f3e6dc56ef33e3e7fee51c4de"
+dependencies = [
+ "cc",
+ "derive_more 2.0.1",
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-core"
+version = "1.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2be3e5c922ccf8a61adc3ebfbf9aadc168dec765c8bc5bf7cb28d9c46bfa5b9b"
+dependencies = [
+ "bytemuck",
+ "nvtx",
+ "puffin",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "risc0-core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317bbf70a8750b64d4fd7a2bdc9d7d5f30d8bb305cae486962c797ef35c8d08e"
+dependencies = [
+ "bytemuck",
+ "bytemuck_derive",
+ "nvtx",
+ "puffin",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "1.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73a946f8e6db205107668379e3058f0091d7f9aef63d8e4956dff5dc7dfac486"
+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 1.2.6",
+ "risc0-core 1.2.6",
+ "risc0-zkp 1.2.6",
+ "serde",
+ "serde_json",
+ "stability",
+ "tempfile",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b31cb7b2a46f0cdaf71803ea7e0389af9f5bc1aea2531106f2972b241f26e98"
+dependencies = [
+ "anyhow",
+ "ark-bn254 0.5.0",
+ "ark-ec 0.5.0",
+ "ark-groth16 0.5.0",
+ "ark-serialize 0.5.0",
+ "bytemuck",
+ "hex",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "risc0-binfmt 2.0.1",
+ "risc0-core 2.0.0",
+ "risc0-zkp 2.0.1",
+ "serde",
+ "serde_json",
+ "stability",
+ "tempfile",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-sys"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11abd6064c039f24b58676419cd13c92cbf4858e66948dd55b188b03511db44c"
+dependencies = [
+ "anyhow",
+ "risc0-build-kernel",
+]
+
+[[package]]
+name = "risc0-zkos-v1compat"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76c479b69d1987cb54ac72dcc017197296fdcd6daf78fafc10cbbd3a167a7de"
+dependencies = [
+ "include_bytes_aligned",
+ "no_std_strings",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "1.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373d06becf7bd3a8e46af6f8cb81509aa363cdddb1ec67a588ac69ad9f968127"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest 0.10.7",
+ "ff 0.13.1",
+ "hex",
+ "hex-literal",
+ "metal",
+ "ndarray",
+ "parking_lot",
+ "paste",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rayon",
+ "risc0-core 1.2.6",
+ "risc0-sys",
+ "risc0-zkvm-platform 1.2.6",
+ "serde",
+ "sha2",
+ "tracing",
 ]
 
 [[package]]
-name = "reqwest"
-version = "0.12.9"
+name = "risc0-zkp"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "fa210a232361fd671b30918469856b64d715f2564956d0a5df97ab6cb116d28b"
 dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-core",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.5.1",
- "hyper-tls 0.6.0",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 2.2.0",
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest 0.10.7",
+ "ff 0.13.1",
+ "hex",
+ "hex-literal",
+ "metal",
+ "ndarray",
+ "parking_lot",
+ "paste",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rayon",
+ "risc0-core 2.0.0",
+ "risc0-sys",
+ "risc0-zkvm-platform 2.0.2",
  "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-registry",
+ "sha2",
+ "stability",
+ "tracing",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.3.1"
+name = "risc0-zkvm"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "6a049319790277845335445b549d49e66341f4a7ffba7f7aaa1e77e2fc4a9c19"
 dependencies = [
- "crypto-bigint 0.4.9",
- "hmac",
- "zeroize",
+ "addr2line 0.22.0",
+ "anyhow",
+ "bincode",
+ "borsh",
+ "bytemuck",
+ "bytes",
+ "derive_more 2.0.1",
+ "elf",
+ "enum-map",
+ "getrandom 0.2.16",
+ "hex",
+ "keccak",
+ "lazy-regex",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "prost",
+ "rand 0.8.5",
+ "rayon",
+ "risc0-binfmt 2.0.1",
+ "risc0-build",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core 2.0.0",
+ "risc0-groth16 2.0.1",
+ "risc0-zkos-v1compat",
+ "risc0-zkp 2.0.1",
+ "risc0-zkvm-platform 2.0.2",
+ "rrs-lib",
+ "rustc-demangle",
+ "rzup",
+ "semver 1.0.26",
+ "serde",
+ "sha2",
+ "stability",
+ "tempfile",
+ "tracing",
+ "typetag",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.4.0"
+name = "risc0-zkvm-platform"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+checksum = "8187245809fe15d389dcdc1ca09ed5f5a1227b15e2fd48860c808aaf02e6996f"
 dependencies = [
- "hmac",
- "subtle",
+ "cfg-if",
+ "stability",
 ]
 
 [[package]]
-name = "ring"
-version = "0.17.8"
+name = "risc0-zkvm-platform"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "2e4de2938eaf24892ef927d9cef6e4acb6a19ce01c017cd498533896f633f332"
 dependencies = [
- "cc",
+ "bytemuck",
  "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
+ "getrandom 0.2.16",
+ "getrandom 0.3.3",
+ "libm",
+ "stability",
 ]
 
 [[package]]
@@ -4223,23 +6232,36 @@ dependencies = [
  "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.12.3"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286"
+checksum = "78a46eb779843b2c4f21fac5773e25d6d5b7c8f0922876c91541790d2ca27eef"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "bytes",
- "fastrlp",
- "num-bigint",
+ "fastrlp 0.3.1",
+ "fastrlp 0.4.0",
+ "num-bigint 0.4.6",
+ "num-integer",
  "num-traits",
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand",
+ "rand 0.8.5",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde",
@@ -4259,6 +6281,18 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[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"
@@ -4280,20 +6314,33 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.23",
+ "semver 1.0.26",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.41"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4310,14 +6357,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.103.3",
  "subtle",
  "zeroize",
 ]
@@ -4331,7 +6379,19 @@ dependencies = [
  "openssl-probe",
  "rustls-pemfile 1.0.4",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
@@ -4354,9 +6414,13 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -4370,10 +6434,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -4381,9 +6446,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 
 [[package]]
 name = "rusty-fork"
@@ -4397,17 +6462,43 @@ dependencies = [
  "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.20",
+ "twox-hash",
+]
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "rzup"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "400558bf12d4292a7804093b60a437ba8b0219ea7d53716b2c010a0d31e5f4a8"
+dependencies = [
+ "semver 1.0.26",
+ "serde",
+ "strum 0.26.3",
+ "tempfile",
+ "thiserror 2.0.12",
+ "toml 0.8.22",
+ "yaml-rust2",
+]
 
 [[package]]
 name = "scc"
-version = "2.2.5"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed"
+checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4"
 dependencies = [
  "sdd",
 ]
@@ -4429,12 +6520,10 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "script-macro"
-version = "0.3.0"
-source = "git+https://github.com/BitVM/rust-bitcoin-script?branch=StructuredScript#226956315350b52df0d8a1608530e0a965f405e1"
+version = "0.4.0"
+source = "git+https://github.com/BitVM/rust-bitcoin-script#519088c7e5e89769910dabcb1b663fa48a21a645"
 dependencies = [
  "bitcoin",
- "hex",
- "lazy_static",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -4452,9 +6541,9 @@ dependencies = [
 
 [[package]]
 name = "sdd"
-version = "3.0.4"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
+checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
 
 [[package]]
 name = "sec1"
@@ -4477,7 +6566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct 0.2.0",
- "der 0.7.9",
+ "der 0.7.10",
  "generic-array",
  "pkcs8 0.10.2",
  "subtle",
@@ -4486,13 +6575,13 @@ dependencies = [
 
 [[package]]
 name = "secp"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4754628ff9006f80c6abd1cd1e88c5ca6f5a60eab151ad2e16268aab3514d0"
+checksum = "dd426921f62c7e334ca27173743cd90a7263566a3be76ef0b47773d631633cf9"
 dependencies = [
  "base16ct 0.2.0",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "secp256k1",
  "serde",
  "serdect",
@@ -4501,21 +6590,21 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.28.2"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
  "bitcoin_hashes",
- "rand",
+ "rand 0.8.5",
  "secp256k1-sys",
  "serde",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.9.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
 dependencies = [
  "cc",
 ]
@@ -4526,8 +6615,21 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
+ "bitflags 2.9.1",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+dependencies = [
+ "bitflags 2.9.1",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -4535,9 +6637,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4554,9 +6656,12 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "semver-parser"
@@ -4575,9 +6680,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "sendfd"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798"
+checksum = "b183bfd5b1bc64ab0c1ef3ee06b008a9ef1b68a7d3a99ba566fbfe7a7c6d745b"
 dependencies = [
  "libc",
  "tokio",
@@ -4585,9 +6690,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
@@ -4605,20 +6710,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -4626,6 +6731,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4670,7 +6784,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4686,9 +6800,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4719,9 +6833,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -4740,9 +6854,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -4754,7 +6868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
  "digest 0.10.7",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4764,18 +6878,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
+[[package]]
+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.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
 dependencies = [
- "num-bigint",
+ "num-bigint 0.4.6",
  "num-traits",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "time",
 ]
 
@@ -4790,15 +6910,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -4809,6 +6929,9 @@ name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
 
 [[package]]
 name = "spki"
@@ -4827,7 +6950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.9",
+ "der 0.7.10",
 ]
 
 [[package]]
@@ -4850,6 +6973,16 @@ 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.101",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -4880,7 +7013,16 @@ version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.4",
+]
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+dependencies = [
+ "strum_macros 0.27.1",
 ]
 
 [[package]]
@@ -4893,7 +7035,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.90",
+ "syn 2.0.101",
+]
+
+[[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.101",
 ]
 
 [[package]]
@@ -4904,9 +7059,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "suppaftp"
-version = "6.0.5"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a593e8bdcd2aff8369ccddf7fd42ae7ccaa0f8b6b343c16ed763c99c20926a29"
+checksum = "a05110ce6c2cb19fc8040c2115a6a8c6d1ef59820ebca1fd81e22183ca525197"
 dependencies = [
  "async-native-tls",
  "async-std",
@@ -4916,7 +7071,7 @@ dependencies = [
  "lazy-regex",
  "log",
  "pin-project",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -4932,9 +7087,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4950,7 +7105,7 @@ dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4970,13 +7125,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4986,7 +7141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
@@ -5008,22 +7163,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if",
  "fastrand",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "thin-vec"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
+checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
 
 [[package]]
 name = "thiserror"
@@ -5036,11 +7191,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -5051,18 +7206,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5076,9 +7231,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -5091,15 +7246,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -5116,19 +7271,34 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 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.41.1"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5154,13 +7324,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5195,12 +7365,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.19",
- "rustls-pki-types",
+ "rustls 0.23.27",
  "tokio",
 ]
 
@@ -5218,9 +7387,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5236,19 +7405,19 @@ checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.19",
+ "rustls 0.23.27",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.2",
  "tungstenite",
- "webpki-roots",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5261,28 +7430,52 @@ dependencies = [
 name = "toml"
 version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
- "winnow",
+ "toml_write",
+ "winnow 0.7.10",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -5298,6 +7491,21 @@ dependencies = [
  "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"
@@ -5341,7 +7549,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5389,42 +7597,82 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.3.1",
  "httparse",
  "log",
- "rand",
- "rustls 0.23.19",
+ "rand 0.8.5",
+ "rustls 0.23.27",
  "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"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75"
+checksum = "ce63bcaf7e9806c206f7d7b9c1f38e0dce8bb165a80af0898161058b19248534"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
+checksum = "60d8d828da2a3d759d3519cdf29a5bac49c77d039ad36d0782edadbf9cd5415b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
 [[package]]
 name = "typenum"
-version = "1.17.0"
+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 = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "ucd-trie"
@@ -5452,9 +7700,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-xid"
@@ -5485,12 +7733,6 @@ 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"
@@ -5505,21 +7747,21 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-bag"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
 [[package]]
 name = "vcpkg"
@@ -5551,9 +7793,9 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
@@ -5573,37 +7815,46 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.97"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.97"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.47"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5614,9 +7865,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.97"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5624,28 +7875,41 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.97"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.97"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.74"
+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 = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5653,18 +7917,39 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.7"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
+]
+
 [[package]]
 name = "widestring"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
 
 [[package]]
 name = "winapi"
@@ -5690,41 +7975,81 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
 [[package]]
 name = "windows-registry"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
  "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link",
 ]
 
 [[package]]
@@ -5778,13 +8103,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "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-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5797,6 +8138,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5809,6 +8156,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5821,12 +8174,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[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_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5839,6 +8204,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5851,6 +8222,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5863,6 +8240,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -5875,11 +8258,26 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -5895,16 +8293,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "write16"
-version = "1.0.0"
+name = "wit-bindgen-rt"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.1",
+]
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "ws_stream_wasm"
@@ -5940,11 +8341,31 @@ 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 = "yaml-rust2"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d"
+dependencies = [
+ "arraydeque",
+ "encoding_rs",
+ "hashlink",
+]
+
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -5954,55 +8375,54 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
  "synstructure",
 ]
 
@@ -6023,14 +8443,25 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -6039,16 +8470,68 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.101",
 ]
 
-[[patch.unused]]
-name = "ark-r1cs-std"
-version = "0.4.0"
-source = "git+https://github.com/arkworks-rs/r1cs-std/#dfdad2b729ebc7e8104931b683f3799246252adc"
+[[package]]
+name = "zip"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 2.0.12",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.15+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index b58ceb959..6f9c528b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,88 +1,70 @@
-[package]
-name = "bitvm"
-version = "0.1.0"
-edition = "2021"
-exclude = ["tests"]
+[workspace]
+resolver = "2"
+members = [
+    "bitvm",
+    "bridge",
+    "fuzz",
+    "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= "StructuredScript" }
-bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm", features = ["rand-std"]}
-strum = "0.26"
-strum_macros = "0.26"
-hex = "0.4.3"
-bitcoin-scriptexec = { git = "https://github.com/BitVM/rust-bitcoin-scriptexec/"}
+default-members = [
+    "bitvm",
+    "bridge",
+    "fuzz",
+]
+
+[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"
+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/chainwayxyz/algebra/", branch = "new-ate-loop", features = ["curve"], default-features = false }
-ark-ff = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-ec = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-groth16 = { git = "https://github.com/arkworks-rs/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/BitVM/rust-bitcoin-script-stack", branch = "bitvm" }
+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"
+blake3 = "1.6.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"] }
-clap = { version = "4.5.16", features = ["derive", "cargo", "env"] }
+clap = { version = "4.5.23", features = ["derive", "cargo", "env"] }
 toml = "0.5.11"
 colored = "2.0.0"
-
-[dev-dependencies]
+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/arkworks-rs/crypto-primitives", features = ["snark", "sponge"] }
-ark-relations = { git = "https://github.com/arkworks-rs/snark/" }
+ark-std = { version = "0.5.0", default-features = false, features = ["print-trace"] }
+ark-crypto-primitives = { version = "0.5.0", features = ["snark", "sponge"] }
+ark-relations = "0.5.0"
 serial_test = "*"
 tqdm = "0.7"
+secp256k1 = { version = "0.29.1", features = ["global-context"]}
+derive_more = "2.0"
 
 [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/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-ec = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-poly = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-serialize = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
-ark-bn254 = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop", features = ["curve"], default-features = false }
-
-ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" }
-ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives/" }
-
-ark-relations = { git = "https://github.com/arkworks-rs/snark/" }
-ark-snark = { git = "https://github.com/arkworks-rs/snark/" }
-ark-groth16 = { git = "https://github.com/arkworks-rs/groth16" }
-
-[[bin]]
-name = "cli"
-
-[[bin]]
-name = "cli-query"
-path = "src/bin/cli_query/main.rs"
diff --git a/DEMO_INSTRUCTIONS.md b/DEMO_INSTRUCTIONS.md
new file mode 100644
index 000000000..23217e7e9
--- /dev/null
+++ b/DEMO_INSTRUCTIONS.md
@@ -0,0 +1,263 @@
+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.
+
+The minimum required UTXO amounts may change in the future, so please use the **get-funding-amounts** CLI command to get up-to-date information. The list below is provided for reference only:
+
+1. Peg-in graph - 'peg-in deposit' tx input: **2097447 SAT** - will be spent by [DEPOSITOR] (use `-d` to get their address)
+2. Peg-out graph - 'peg-out confirm' tx input: **3607030 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/README.md b/README.md
index c8053323d..da35154ab 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,277 @@
-# 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".
+
+- [**Chunk**](bitvm/src/chunk/):
+  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 Funding Amounts (useful in testing):
+1. Description: Get minimum required amounts for the funding UTXOs (to be used in testing).
+2. Usage:
+```bash
+./target/release/bridge get-funding-amounts
+```
+
+#### 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/audits/BitVM - Zellic Audit Report.pdf b/audits/BitVM - Zellic Audit Report.pdf
new file mode 100644
index 000000000..49b5e764d
Binary files /dev/null and b/audits/BitVM - Zellic Audit Report.pdf differ
diff --git a/bitvm/Cargo.toml b/bitvm/Cargo.toml
new file mode 100644
index 000000000..1ea6f8de8
--- /dev/null
+++ b/bitvm/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "bitvm"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+
+[dependencies]
+bitcoin-script.workspace = true
+bitcoin.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 88%
rename from src/bigint/add.rs
rename to bitvm/src/bigint/add.rs
index 34d542d04..07a88f6d9 100644
--- a/src/bigint/add.rs
+++ b/bitvm/src/bigint/add.rs
@@ -63,24 +63,27 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
+    /// add one
     pub fn add1() -> Script {
         script! {
-            1
-            { 1 << LIMB_SIZE }
-
-            // A0 + 1
-            limb_add_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_1ADD                             // a0 ... an
+            { 1 << LIMB_SIZE }                  // a0 ... an x
+            OP_SWAP                             // a0 ... x an
+            for _ in 0..Self::N_LIMBS-1 {       // ... x a
+                OP_2DUP                         // ... x a x a
+                OP_EQUAL                        // ... x a 0/1
+                OP_TUCK                         // ... x 0/1 a 0/1
+                OP_IF OP_NOT OP_ENDIF           // ... x 0/1 a/0
+                OP_TOALTSTACK                   // ... x 0/1
+                OP_ROT                          // .. x 0/1 a_{i-1}
+                OP_ADD                          // .. x a'
             }
-
-            // A{N-1} + carry_{N-2}
-            OP_NIP
-            { limb_add_nocarry(Self::HEAD_OFFSET) }
+                                                // x a0
+            OP_NIP                              // a0
+            { Self::HEAD_OFFSET }               // a0 y
+            OP_OVER                             // a0 y a0
+            OP_EQUAL                            // a0 0/1
+            OP_IF OP_NOT OP_ENDIF               // a/0
 
             for _ in 0..Self::N_LIMBS - 1 {
                 OP_FROMALTSTACK
@@ -89,7 +92,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     }
 
     /// Double the BigInt on top of the stack
-    /// 
+    ///
     /// # Note
     ///
     /// This function allows overflow of the underlying integer types during
@@ -123,15 +126,15 @@ 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
-            { n + 1 } OP_PICK limb_double_without_carry OP_TOALTSTACK
+            { n * Self::N_LIMBS + 1 } OP_PICK limb_double_without_carry OP_TOALTSTACK
 
             for i in 0..Self::N_LIMBS - 2 {
-                { n + i +  3 } OP_PICK limb_double_with_carry OP_TOALTSTACK
+                { n * Self::N_LIMBS + 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}
-            { n + 9 } OP_PICK { limb_double_with_carry_allow_overflow(Self::HEAD_OFFSET) } 
+            { n * Self::N_LIMBS + Self::N_LIMBS } 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 {
@@ -141,7 +144,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     }
 
     /// Double the BigInt on top of the stack
-    /// 
+    ///
     /// # Note
     ///
     /// This function prevents overflow of the underlying integer types during
@@ -169,8 +172,27 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
+    /// Double the referenced BigInt but keep the original element in its position
+    /// This function prevents overflow of the underlying integer types during
+    /// doubling operation.
+    pub fn double_prevent_overflow_keep_element(n: u32) -> Script {
+        script! {
+            { 1 << LIMB_SIZE }
+            { n * Self::N_LIMBS + 1 } OP_PICK limb_double_without_carry OP_TOALTSTACK
+            for i in 0..Self::N_LIMBS - 2 {
+                { n * Self::N_LIMBS + i + 3 } OP_PICK limb_double_with_carry OP_TOALTSTACK
+            }
+            OP_NIP
+            { n * Self::N_LIMBS + Self::N_LIMBS } OP_PICK OP_SWAP
+            { limb_double_with_carry_prevent_overflow(Self::HEAD_OFFSET) }
+            for _ in 0..Self::N_LIMBS - 1 {
+                OP_FROMALTSTACK
+            }
+        }
+    }
+
     /// Left shift the BigInt on top of the stack by `bits`
-    /// 
+    ///
     /// # Note
     ///
     /// This function prevents overflow of the underlying integer types during
@@ -204,11 +226,11 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             OP_OVER
             OP_ADD
 
-            // OP_DEPTH OP_1SUB OP_PICK 
+            // OP_DEPTH OP_1SUB OP_PICK
             { 1 << LIMB_SIZE }
             OP_SWAP
 
-            { limb_add_create_carry() } 
+            { limb_add_create_carry() }
             OP_TOALTSTACK
 
             for i in 0..Self::N_LIMBS - 2 {
@@ -230,8 +252,6 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
-
-    
     /// Add BigInt on top of the stack to a BigInt at `b` depth in the stack
     ///
     /// # Note
@@ -245,11 +265,11 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             { b_depth } OP_PICK
             OP_ADD
 
-            // OP_DEPTH OP_1SUB OP_PICK 
+            // OP_DEPTH OP_1SUB OP_PICK
             { 1 << LIMB_SIZE }
             OP_SWAP
 
-            { limb_add_create_carry() } 
+            { limb_add_create_carry() }
             OP_TOALTSTACK
 
             for _ in 0..Self::N_LIMBS - 2 {
@@ -261,7 +281,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
 
             OP_NIP
             { b_depth + 1 } OP_PICK
-            OP_ROT
+            OP_SWAP
             { limb_add_with_carry_prevent_overflow(Self::HEAD_OFFSET) }
 
             for _ in 0..Self::N_LIMBS - 1 {
@@ -371,7 +391,7 @@ 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 OP_ADD OP_ADD OP_NIP                         // {a} {b} {a+b+c}
         { head_offset >> 1 }                                 // {a} {b} {a+b+c} {x}
@@ -388,7 +408,7 @@ fn limb_add_with_carry_prevent_overflow(head_offset: u32) -> Script {
         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_GREATERTHAN                                       // {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
     }
 }
@@ -444,7 +464,7 @@ fn limb_double_with_carry_prevent_overflow(head_offset: u32) -> Script {
         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_2DUP OP_LESSTHANOREQUAL                       // {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}
 
@@ -505,7 +525,7 @@ fn limb_lshift_with_carry_prevent_overflow(bits: u32, head: u32) -> Script {
             }
             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}
@@ -521,7 +541,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};
@@ -565,49 +585,35 @@ mod test {
     }
 
     #[test]
-    fn test_double() {
-        println!("U254.double: {} bytes", U254::double(0).len());
+    fn test_add1() {
+        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() + a.clone()).rem(BigUint::one().shl(254));
+            let c: BigUint = (a.clone() + BigUint::one()).rem(BigUint::one().shl(254));
 
             let script = script! {
                 { U254::push_u32_le(&a.to_u32_digits()) }
-                { U254::double(0) }
+                { U254::add1() }
                 { U254::push_u32_le(&c.to_u32_digits()) }
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
             run(script);
         }
-
-        for _ in 0..100 {
-            let a: u64 = prng.gen();
-            let c = a.wrapping_add(a);
-
-            let script = script! {
-                { U64::push_u64_le(&[a]) }
-                { U64::double(0) }
-                { U64::push_u64_le(&[c]) }
-                { U64::equalverify(1, 0) }
-                OP_TRUE
-            };
-            run(script);
-        }
     }
 
     #[test]
-    fn test_1add() {
-        println!("U254.add1: {} bytes", U254::add1().len());
+    fn test_double() {
+        println!("U254.double: {} bytes", U254::double(0).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 c: BigUint = (a.clone() + a.clone()).rem(BigUint::one().shl(254));
 
             let script = script! {
                 { U254::push_u32_le(&a.to_u32_digits()) }
-                { U254::add1() }
+                { U254::double(0) }
                 { U254::push_u32_le(&c.to_u32_digits()) }
                 { U254::equalverify(1, 0) }
                 OP_TRUE
@@ -617,11 +623,11 @@ mod test {
 
         for _ in 0..100 {
             let a: u64 = prng.gen();
-            let c = a.wrapping_add(1u64);
+            let c = a.wrapping_add(a);
 
             let script = script! {
                 { U64::push_u64_le(&[a]) }
-                { U64::add1() }
+                { U64::double(0) }
                 { U64::push_u64_le(&[c]) }
                 { U64::equalverify(1, 0) }
                 OP_TRUE
diff --git a/src/bigint/bits.rs b/bitvm/src/bigint/bits.rs
similarity index 83%
rename from src/bigint/bits.rs
rename to bitvm/src/bigint/bits.rs
index 9b29524c1..7f7868fe3 100644
--- a/src/bigint/bits.rs
+++ b/bitvm/src/bigint/bits.rs
@@ -45,44 +45,6 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             { limb_to_le_bits_toaltstack(N_BITS - LIMB_SIZE * (Self::N_LIMBS - 1)) }
         }
     }
-
-    pub fn limb_from_bytes() -> Script {
-        let bytes_per_limb = (LIMB_SIZE + 7) / 8;
-
-        assert!(LIMB_SIZE > 0, "LIMB_SIZE must not be 0");
-        assert!(LIMB_SIZE < 33, "LIMB_SIZE must be less than 33");
-
-        script! {
-            // This will be our sum on the stack
-            OP_0
-            for i in 0..bytes_per_limb {
-                // Check that the number is a u8
-                OP_SWAP
-                OP_DUP
-                { 256 }
-                OP_LESSTHAN
-                OP_VERIFY
-                // lshift
-                for _ in 0..8*i {
-                    OP_DUP
-                    OP_ADD
-                }
-                OP_ADD
-            }
-        }
-    }
-
-    pub fn from_bytes() -> Script {
-        script! {
-            for _ in 0..Self::N_LIMBS {
-                { Self::limb_from_bytes() }
-                OP_TOALTSTACK
-            }
-            for _ in 0..Self::N_LIMBS {
-                OP_FROMALTSTACK
-            }
-        }
-    }
 }
 
 fn limb_to_be_bits_common(num_bits: u32) -> Script {
@@ -171,16 +133,19 @@ fn limb_to_le_bits_common(num_bits: u32) -> Script {
 }
 
 pub fn limb_to_le_bits(num_bits: u32) -> Script {
+    assert!(num_bits > 0);
     if num_bits >= 2 {
         script! {
             { limb_to_le_bits_common(num_bits) }
         }
     } else {
+        // if num_bits == 1
         script! {}
     }
 }
 
 pub fn limb_to_le_bits_toaltstack(num_bits: u32) -> Script {
+    assert!(num_bits > 0);
     if num_bits >= 2 {
         script! {
             { limb_to_le_bits_common(num_bits) }
@@ -189,11 +154,15 @@ pub fn limb_to_le_bits_toaltstack(num_bits: u32) -> Script {
             }
         }
     } else {
-        script! {}
+        // if num_bits == 1
+        script! {
+            OP_TOALTSTACK
+        }
     }
 }
 
 pub fn limb_to_be_bits(num_bits: u32) -> Script {
+    assert!(num_bits > 0);
     if num_bits >= 2 {
         script! {
             { limb_to_be_bits_common(num_bits) }
@@ -202,11 +171,13 @@ pub fn limb_to_be_bits(num_bits: u32) -> Script {
             }
         }
     } else {
+        // if num_bits == 1
         script! {}
     }
 }
 
 pub fn limb_to_be_bits_toaltstack(num_bits: u32) -> Script {
+    assert!(num_bits > 0);
     if num_bits >= 2 {
         script! {
             { limb_to_be_bits_common(num_bits) }
@@ -214,6 +185,7 @@ pub fn limb_to_be_bits_toaltstack(num_bits: u32) -> Script {
             OP_TOALTSTACK
         }
     } else {
+        // if num_bits == 1
         script! {
             OP_TOALTSTACK
         }
@@ -304,11 +276,6 @@ mod test {
             };
             run(script);
         }
-
-        let script = script! {
-            0 { limb_to_be_bits(0) } 0 OP_EQUAL
-        };
-        run(script);
     }
 
     #[test]
@@ -385,11 +352,6 @@ mod test {
             };
             run(script);
         }
-
-        let script = script! {
-            0 { limb_to_le_bits(0) } 0 OP_EQUAL
-        };
-        run(script);
     }
 
     #[test]
@@ -598,93 +560,4 @@ mod test {
             run(script);
         }
     }
-
-    #[test]
-    fn test_u29_limb_from_bytes() {
-        assert_eq!(U254::N_LIMBS, 9);
-        let script = script! {
-            { 0x01 }
-            { 0x12 }
-            { 0x13 }
-            { 0x14 }
-            { U254::limb_from_bytes() }
-            { 0x01121314 }
-            OP_EQUAL
-        };
-        run(script);
-
-        let script = script! {
-            { 0x00 }
-            { 0x01 }
-            { 0x13 }
-            { 0x14 }
-            { U254::limb_from_bytes() }
-            { 0x00011314 }
-            OP_EQUAL
-        };
-        run(script);
-    }
-    #[test]
-    fn test_u254_from_bytes() {
-        assert_eq!(U254::N_LIMBS, 9);
-        let script = script! {
-            { 0x00 }
-            { 0x01 }
-            { 0x13 }
-            { 0x14 }
-
-            { 0x01 }
-            { 0x22 }
-            { 0x23 }
-            { 0x24 }
-
-            { 0x01 }
-            { 0x32 }
-            { 0x33 }
-            { 0x34 }
-
-            { 0x01 }
-            { 0x42 }
-            { 0x43 }
-            { 0x44 }
-
-            { 0x01 }
-            { 0x52 }
-            { 0x53 }
-            { 0x54 }
-
-            { 0x01 }
-            { 0x62 }
-            { 0x63 }
-            { 0x64 }
-
-            { 0x01 }
-            { 0x72 }
-            { 0x73 }
-            { 0x74 }
-
-            { 0x01 }
-            { 0x82 }
-            { 0x83 }
-            { 0x84 }
-
-            { 0x01 }
-            { 0x92 }
-            { 0x93 }
-            { 0x94 }
-
-            { U254::from_bytes() }
-            { 0x00011314 }
-            { 0x01222324 }
-            { 0x01323334 }
-            { 0x01424344 }
-            { 0x01525354 }
-            { 0x01626364 }
-            { 0x01727374 }
-            { 0x01828384 }
-            { 0x01929394 }
-            { U254::equal(0, 1) }
-        };
-        run(script);
-    }
 }
diff --git a/src/bigint/cmp.rs b/bitvm/src/bigint/cmp.rs
similarity index 95%
rename from src/bigint/cmp.rs
rename to bitvm/src/bigint/cmp.rs
index 72e6243c2..ec1df1780 100644
--- a/src/bigint/cmp.rs
+++ b/bitvm/src/bigint/cmp.rs
@@ -27,6 +27,22 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
+    pub fn equal_keep_elements(a: u32, b: u32) -> Script {
+        script! {
+            { Self::copy_zip(a, b) }
+            for _ in 0..Self::N_LIMBS {
+                OP_EQUAL
+                OP_TOALTSTACK
+            }
+            for _ in 0..Self::N_LIMBS {
+                OP_FROMALTSTACK
+            }
+            for _ in 0..Self::N_LIMBS - 1 {
+                OP_BOOLAND
+            }
+        }
+    }
+
     pub fn notequal(a: u32, b: u32) -> Script {
         script! {
             { Self::equal(a, b) }
@@ -69,7 +85,9 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     }
 
     // return if a <= b
-    pub fn lessthanorequal(a: u32, b: u32) -> Script { Self::greaterthanorequal(b, a) }
+    pub fn lessthanorequal(a: u32, b: u32) -> Script {
+        Self::greaterthanorequal(b, a)
+    }
 
     // return if a > b
     pub fn greaterthan(a: u32, b: u32) -> Script {
diff --git a/bitvm/src/bigint/inv.rs b/bitvm/src/bigint/inv.rs
new file mode 100644
index 000000000..abfd1b59a
--- /dev/null
+++ b/bitvm/src/bigint/inv.rs
@@ -0,0 +1,293 @@
+use crate::bigint::BigIntImpl;
+use crate::treepp::*;
+
+impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
+    pub fn div2() -> Script {
+        script! {
+            { Self::div2rem() }
+            OP_DROP
+        }
+    }
+
+    pub fn div2rem() -> Script {
+        script! {
+            { Self::N_LIMBS - 1 } OP_ROLL
+            0
+            { limb_shr1_carry(Self::HEAD) }
+
+            for _ in 1..Self::N_LIMBS {
+                { Self::N_LIMBS } OP_ROLL
+                OP_SWAP
+                { limb_shr1_carry(LIMB_SIZE) }
+            }
+        }
+    }
+
+    pub fn div3() -> Script {
+        script! {
+            { Self::div3rem() }
+            OP_DROP
+        }
+    }
+
+    pub fn div3rem() -> Script {
+        script! {
+            { Self::N_LIMBS - 1 } OP_ROLL
+            0
+            { limb_div3_carry(Self::HEAD) }
+
+            for _ in 1..Self::N_LIMBS {
+                { Self::N_LIMBS } OP_ROLL
+                OP_SWAP
+                { limb_div3_carry(LIMB_SIZE) }
+            }
+        }
+    }
+}
+
+pub fn limb_shr1_carry(num_bits: u32) -> Script {
+    let powers_of_2_script = if num_bits < 7 {
+        script! {
+            for i in 1..num_bits {
+                { 2_u32.pow(i) }
+            }
+        }
+    } else {
+        script! {
+            2 4 8 16 32 64              // 2^1 to 2^6
+            for _ in 0..num_bits - 7 {
+                OP_DUP OP_DUP OP_ADD
+            }                           // 2^7 to 2^{num_bits - 1}
+        }
+    };
+
+    script! {
+        { powers_of_2_script }
+        { num_bits - 1 } OP_ROLL
+        OP_IF
+            OP_DUP
+        OP_ELSE
+            0
+        OP_ENDIF
+        OP_TOALTSTACK
+
+        { num_bits - 1 } OP_ROLL
+
+        for _ in 0..num_bits - 2 {
+            OP_2DUP OP_LESSTHANOREQUAL
+            OP_IF
+                OP_SWAP OP_SUB OP_SWAP OP_DUP OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_SWAP
+            OP_ELSE
+                OP_NIP
+            OP_ENDIF
+        }
+
+        OP_2DUP OP_LESSTHANOREQUAL
+        OP_IF
+            OP_SWAP OP_SUB OP_FROMALTSTACK OP_1ADD
+        OP_ELSE
+            OP_NIP OP_FROMALTSTACK
+        OP_ENDIF
+        OP_SWAP
+    }
+}
+
+// divide limb by 3, also remainder
+pub fn limb_div3_carry(limb_size: u32) -> Script {
+    let max_limb = (1 << limb_size) as i64;
+
+    let x_quotient = max_limb / 3;
+    let x_remainder = max_limb % 3;
+
+    let y_quotient = max_limb * 2 / 3;
+    let y_remainder = max_limb * 2 % 3;
+
+    let mut k = 0;
+    let mut cur = 1;
+    while cur < max_limb {
+        k += 1;
+        cur *= 3;
+    }
+
+    script! {
+        1 2 3 6 9 18 27 54
+        for _ in 0..k - 4 {
+            OP_2DUP OP_ADD
+            OP_DUP OP_DUP OP_ADD
+        }
+
+        { 2 * k } OP_ROLL OP_DUP
+        0 OP_GREATERTHAN
+        OP_IF
+            OP_1SUB
+            OP_IF
+                { y_remainder } { y_quotient }
+            OP_ELSE
+                { x_remainder } { x_quotient }
+            OP_ENDIF
+        OP_ELSE
+            0
+        OP_ENDIF
+        OP_TOALTSTACK
+
+        { 2 * k + 1 } OP_ROLL OP_ADD
+
+        for _ in 0..2 * k - 2 {
+            OP_2DUP OP_LESSTHANOREQUAL
+            OP_IF
+                OP_SWAP OP_SUB 2 OP_PICK OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
+            OP_ELSE
+                OP_NIP
+            OP_ENDIF
+        }
+
+        OP_NIP OP_NIP OP_FROMALTSTACK OP_SWAP
+    }
+}
+
+#[cfg(test)]
+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};
+    use rand_chacha::ChaCha20Rng;
+
+    #[test]
+    fn test_limb_shr1_carry() {
+        for shift in 2..30 {
+            println!(
+                "limb_shr1_carry({:?}): {} bytes",
+                shift,
+                limb_shr1_carry(shift).len()
+            );
+            let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+            for _ in 0..100 {
+                let mut a: u32 = prng.gen();
+                a %= 1 << shift;
+
+                let script = script! {
+                    { a }
+                    { 0 }
+                    { limb_shr1_carry(shift) }
+                    { a & 1 } OP_EQUALVERIFY
+                    { a >> 1 } OP_EQUAL
+                };
+
+                run(script);
+            }
+
+            for _ in 0..100 {
+                let mut a: u32 = prng.gen();
+                a %= 1 << shift;
+
+                let script = script! {
+                    { a }
+                    { 1 }
+                    { limb_shr1_carry(shift) }
+                    { a & 1 } OP_EQUALVERIFY
+                    { (1 << (shift - 1)) | (a >> 1) } OP_EQUAL
+                };
+
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_limb_div3_carry() {
+        println!("limb_div3_carry: {} bytes", limb_div3_carry(29).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let mut a: u32 = prng.gen();
+            a %= 1 << 29;
+            let k = 2_u32.pow(29);
+
+            for r in 0..3 {
+                let a2 = a + r * k;
+                let b = a2 % 3;
+                let c = a2 / 3;
+                let script = script! {
+                    { a }
+                    { r }
+                    { limb_div3_carry(29) }
+                    { b } OP_EQUALVERIFY
+                    { c } OP_EQUAL
+                };
+
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_div2() {
+        println!("U254.div2: {} bytes", U254::div2().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().shr(1);
+
+            let script = script! {
+                { U254::push_u32_le(&a.to_u32_digits()) }
+                { U254::div2() }
+                { U254::push_u32_le(&c.to_u32_digits()) }
+                { U254::equalverify(1, 0) }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+        for _ in 0..100 {
+            let a: BigUint = prng.sample(RandomBits::new(64));
+            let c: BigUint = a.clone().shr(1);
+
+            let script = script! {
+                { U64::push_u32_le(&a.to_u32_digits()) }
+                { U64::div2() }
+                { U64::push_u32_le(&c.to_u32_digits()) }
+                { U64::equalverify(1, 0) }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_div3() {
+        println!("U254.div3: {} bytes", U254::div3().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().div(BigUint::from(3_u32));
+
+            let script = script! {
+                { U254::push_u32_le(&a.to_u32_digits()) }
+                { U254::div3() }
+                { U254::push_u32_le(&c.to_u32_digits()) }
+                { U254::equalverify(1, 0) }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+        for _ in 0..100 {
+            let a: BigUint = prng.sample(RandomBits::new(64));
+            let c: BigUint = a.clone().div(BigUint::from(3_u32));
+
+            let script = script! {
+                { U64::push_u32_le(&a.to_u32_digits()) }
+                { U64::div3() }
+                { U64::push_u32_le(&c.to_u32_digits()) }
+                { U64::equalverify(1, 0) }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+}
diff --git a/src/bigint/mod.rs b/bitvm/src/bigint/mod.rs
similarity index 71%
rename from src/bigint/mod.rs
rename to bitvm/src/bigint/mod.rs
index 6679f65d8..441296fa4 100644
--- a/src/bigint/mod.rs
+++ b/bitvm/src/bigint/mod.rs
@@ -5,17 +5,20 @@ pub mod inv;
 pub mod mul;
 pub mod std;
 pub mod sub;
-pub mod u29x9;
-pub mod u32x8;
 
+#[derive(Debug)]
 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 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;
+    const _ASSERTION1: () = assert!(Self::N_LIMBS > 1);
+    const _ASSERTION2: () = assert!(Self::LIMB_SIZE < 31);
 }
 
 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 89%
rename from src/bigint/mul.rs
rename to bitvm/src/bigint/mul.rs
index 6a7a3d544..51f2cde03 100644
--- a/src/bigint/mul.rs
+++ b/bitvm/src/bigint/mul.rs
@@ -7,18 +7,15 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         script! {
             { Self::convert_to_be_bits_toaltstack() }
 
-            { push_to_stack(0,Self::N_LIMBS as usize) }
-
-
             OP_FROMALTSTACK
             OP_IF
-                { Self::copy(1) }
-                { Self::add(1, 0) }
+                { Self::copy(0) }
+            OP_ELSE
+                { push_to_stack(0, Self::N_LIMBS as usize)}
             OP_ENDIF
 
             for _ in 1..N_BITS - 1 {
-                { Self::roll(1) }
-                { Self::double(0) }
+                { Self::double(1) }
                 { Self::roll(1) }
                 OP_FROMALTSTACK
                 OP_IF
@@ -27,8 +24,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
                 OP_ENDIF
             }
 
-            { Self::roll(1) }
-            { Self::double(0) }
+            { Self::double(1) }
             OP_FROMALTSTACK
             OP_IF
                 { Self::add(1, 0) }
diff --git a/bitvm/src/bigint/std.rs b/bitvm/src/bigint/std.rs
new file mode 100644
index 000000000..b2fbef1b6
--- /dev/null
+++ b/bitvm/src/bigint/std.rs
@@ -0,0 +1,1260 @@
+use bitcoin::script::read_scriptint;
+use num_bigint::BigUint;
+use num_traits::Num;
+use std::cmp::Ordering;
+use std::str::FromStr;
+
+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 biguint_to_limbs(x: BigUint) -> Vec<u32> {
+        let mut limbs = vec![];
+        let bits: Vec<bool> = (0..N_BITS).map(|i| x.bit(i as u64)).collect();
+        for chunk in bits.chunks(LIMB_SIZE as usize) {
+            let mut limb_value = 0u32;
+            for (i, bit_value) in chunk.into_iter().enumerate() {
+                limb_value += (*bit_value as u32) << i;
+            }
+            limbs.push(limb_value);
+        }
+        limbs
+    }
+
+    pub fn push_biguint(x: BigUint) -> Script {
+        script! {
+            for limb in Self::biguint_to_limbs(x).iter().rev() {
+                { *limb }
+            }
+        }
+    }
+
+    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);
+            }
+        }
+        // make sure most significant 1 lies inside the limits
+        let ms_one = if bits.len() > 0 {
+            let mut ms_one = bits.len() - 1;
+            while !bits[ms_one] {
+                if ms_one != 0 {
+                    ms_one -= 1;
+                } else {
+                    break;
+                }
+            }
+            ms_one
+        } else {
+            0
+        };
+        assert!(ms_one < Self::N_BITS as usize);
+        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.into_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, chunk_i) in chunk_vec.into_iter().enumerate() {
+                if chunk_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 < 128 {
+                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
+        }
+    }
+
+    pub fn check_validity() -> Script {
+        script! {                            // a0 a1 ... an
+            { 1 << LIMB_SIZE }               // a0 a1 ... an x
+            for _ in 0..Self::N_LIMBS-2 {    // a x
+                OP_TUCK                      // x a x
+                0 OP_SWAP                    // x a 0 x
+                OP_WITHIN OP_VERIFY          // x
+            }                                // a0 a1 x
+            0 OP_SWAP                        // a0 a1 0 x
+            OP_WITHIN OP_VERIFY              // a0
+            0 { Self::HEAD_OFFSET }          // a0 0 y
+            OP_WITHIN OP_VERIFY
+        }
+    }
+
+    /// 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.is_empty() {
+            //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,
+                            extract_window: source_limb_remaining_bits,
+                            drop_currentlimb: true,
+                            initiate_targetlimb: first_iter_flag,
+                        });
+                        target_limb_remaining_bits -= source_limb_remaining_bits;
+                        limb_sizes.pop();
+                    }
+                    Ordering::Equal => {
+                        transform_steps.push(TransformStep {
+                            current_limb_remaining_bits: source_limb_remaining_bits,
+                            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,
+                            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
+                        }
+                    }
+                }
+            )
+        }
+    }
+
+    /// Validate that the BigInt on stack has valid limb values
+    ///
+    /// This function checks that each limb in the BigInt representation
+    /// does not exceed the maximum value allowed for the given LIMB_SIZE
+    /// and ensures no limb is negative.
+    ///
+    /// ## Stack Effects:
+    /// - Input: BigInt limbs (MSB first, LSB on top)
+    /// - Output: Same BigInt limbs + validation result (1 if valid, 0 if invalid)
+    ///
+    /// ## Validation Rules:
+    /// - Each limb must be >= 0 (no negative values)
+    /// - Each limb must be < (1 << LIMB_SIZE)
+    /// - The head limb must be < (1 << HEAD_OFFSET) where HEAD_OFFSET is the remaining bits
+    ///
+    /// ## Note:
+    /// This function is expensive in terms of script size and should be used carefully
+    pub fn is_valid_bigint_with_limb_size(limb_size: u32) -> Script {
+        let n_limbs = N_BITS.div_ceil(limb_size);
+        let head = N_BITS - (n_limbs - 1) * limb_size;
+        script! {
+            // Start with validation result = 1 (valid)
+            1
+
+            // Validate each regular limb (except the head)
+            for i in 0..n_limbs - 1 {
+                // Pick the limb from stack (limbs are ordered MSB first, LSB on top)
+                { i + 1 } OP_PICK
+
+                // Check if limb >= 0 (not negative)
+                OP_DUP
+                0 OP_GREATERTHANOREQUAL
+
+                // Check if limb < (1 << LIMB_SIZE)
+                OP_SWAP
+                { 1 << limb_size }
+                OP_LESSTHAN
+
+                // AND the boolean results
+                OP_BOOLAND OP_BOOLAND
+            }
+
+            // Validate the head limb (MSB) separately as it may have fewer bits
+            { n_limbs } OP_PICK
+
+            // Check if head limb >= 0 (not negative)
+            OP_DUP
+            0 OP_GREATERTHANOREQUAL
+
+            // Check if head limb < (1 << HEAD)
+            OP_SWAP
+            { 1 << head }
+            OP_LESSTHAN
+
+            // AND the boolean results
+            OP_BOOLAND OP_BOOLAND
+        }
+    }
+
+    /// Validate BigInt and fail script if invalid
+    pub fn verify_bigint_on_stack_with_limb_size(limb_size: u32) -> Script {
+        script! {
+            { Self::is_valid_bigint_with_limb_size(limb_size) }
+            OP_VERIFY
+        }
+    }
+
+    pub fn verify_bigint_on_stack() -> Script {
+        Self::verify_bigint_on_stack_with_limb_size(Self::LIMB_SIZE)
+    }
+
+    pub fn is_valid_bigint() -> Script {
+        Self::is_valid_bigint_with_limb_size(Self::LIMB_SIZE)
+    }
+}
+
+/// 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::U256;
+    use crate::bigint::{BigIntImpl, U254};
+    use crate::{execute_script, run};
+
+    use bitcoin_script::script;
+    use num_bigint::{BigUint, RandBigInt};
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha20Rng;
+
+    #[test]
+    fn test_valid_bigint() {
+        let invalid_bigint = (
+            script! {
+                {0} {0} {0} {0} {0} {0} {0} {0} {-1}
+            },
+            false,
+        );
+
+        let invalid_bigint2 = (
+            script! {
+                {1 << U256::HEAD} {0} {0} {0} {0} {0} {0} {0} {0}
+            },
+            false,
+        );
+
+        let valid_bigint = (
+            script! {
+                {0x1234} {0x1234} {0x1234} {0x1234} {0x1234} {0x1234} {0x1234} {0x1234} {0x1234}
+            },
+            true,
+        );
+
+        for (bigint, expected) in [invalid_bigint, invalid_bigint2, valid_bigint] {
+            let res = execute_script(script! {
+                {bigint.clone()}
+                { U256::is_valid_bigint() }
+                OP_TOALTSTACK
+                for _ in 0..9 { OP_DROP }
+                OP_FROMALTSTACK
+            });
+            assert_eq!(res.success, expected);
+        }
+    }
+
+    #[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);
+        }
+    }
+
+    #[test]
+    fn test_biguint_to_limbs() {
+        const LIMB_SIZE: u32 = 29;
+        type U256 = BigIntImpl<256, LIMB_SIZE>;
+        let mut prng = ChaCha20Rng::seed_from_u64(37);
+        for _ in 0..100 {
+            let x: BigUint = prng.gen_biguint(256);
+            let mut sum = BigUint::from(0u32);
+            for limb in U256::biguint_to_limbs(x.clone()).iter().rev() {
+                sum = (sum * (1u32 << LIMB_SIZE)) + limb;
+            }
+            assert_eq!(sum, x);
+        }
+    }
+}
diff --git a/src/bigint/sub.rs b/bitvm/src/bigint/sub.rs
similarity index 71%
rename from src/bigint/sub.rs
rename to bitvm/src/bigint/sub.rs
index 537632aa2..92cb72c4f 100644
--- a/src/bigint/sub.rs
+++ b/bitvm/src/bigint/sub.rs
@@ -31,6 +31,32 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             }
         }
     }
+
+    pub fn neg() -> Script {
+        script! {                               // ... a_n
+            { (1 << LIMB_SIZE) - 1 }            // ... a_n x
+
+            for _ in 0..Self::N_LIMBS-2 {       // ... a_{i-1} a_i x
+                OP_TUCK                         // ... a_{i-1} x a_i x
+                OP_SWAP                         // ... a_{i-1} x x a_i
+                OP_SUB                          // ... a_{i-1} x x-a_i
+                OP_TOALTSTACK                   // ... a_{i-1} x
+            }
+                                                // a_0 a_1 x
+            OP_SWAP                             // a_0 x a_1
+            OP_SUB                              // a_0 x-a_1
+            OP_TOALTSTACK                       // a_0
+
+            { Self::HEAD_OFFSET-1 }
+            OP_SWAP
+            OP_SUB
+
+            for _ in 0..Self::N_LIMBS-1 {
+                OP_FROMALTSTACK
+            }
+            { Self::add1() }
+        }
+    }
 }
 
 /// Compute the difference of two limbs, including the carry bit
@@ -134,4 +160,23 @@ mod test {
             run(script);
         }
     }
+
+    #[test]
+    fn test_neg() {
+        println!("U254.neg: {} bytes", U254::neg().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let a: BigUint = prng.sample(RandomBits::new(254));
+
+        let script = script! {
+            { U254::push_zero() }
+            { U254::push_u32_le(&a.to_u32_digits()) }
+            { U254::sub(1, 0) }
+            { U254::push_u32_le(&a.to_u32_digits()) }
+            { U254::neg() }
+            { U254::equalverify(1, 0) }
+            OP_TRUE
+        };
+        run(script);
+    }
 }
diff --git a/bitvm/src/bn254/ell_coeffs.rs b/bitvm/src/bn254/ell_coeffs.rs
new file mode 100644
index 000000000..71599ec8e
--- /dev/null
+++ b/bitvm/src/bn254/ell_coeffs.rs
@@ -0,0 +1,348 @@
+// Rephrased from https://github.com/arkworks-rs/algebra/blob/master/ec/src/models/bn/g2.rs#L185
+// Cannot directly obtain G2 because of visibility
+
+use ark_bn254::Config;
+use ark_ec::bn::g2::G2Prepared as ark_G2Prepared;
+use ark_ec::bn::{BnConfig, TwistType};
+use ark_ec::pairing::{MillerLoopOutput, Pairing, PairingOutput};
+use ark_ec::short_weierstrass::Affine;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::Field;
+use ark_ff::{AdditiveGroup, CyclotomicMultSubgroup};
+use itertools::Itertools;
+use num_traits::One;
+
+pub type G2Affine<P> = Affine<<P as BnConfig>::G2Config>;
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct G2Prepared {
+    /// Stores the coefficients of the line evaluations as calculated in
+    /// <https://eprint.iacr.org/2013/722.pdf>
+    pub ell_coeffs: Vec<EllCoeff>,
+    pub infinity: bool,
+}
+
+// aka. line in miller loop.
+pub type EllCoeff = (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2);
+
+impl Default for G2Prepared {
+    fn default() -> Self {
+        Self::from(ark_bn254::G2Affine::generator())
+    }
+}
+
+impl G2Prepared {
+    fn affine_double_in_place(
+        t: &mut ark_bn254::G2Affine,
+        three_div_two: &ark_bn254::Fq,
+    ) -> EllCoeff {
+        //  for affine coordinates
+        //  slope: alpha = 3 * x^2 / 2 * y
+        // intercept: bias = y - alpha * x
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha.mul_assign_by_fp(three_div_two);
+        let bias = t.y - alpha * t.x;
+
+        // update T
+        // T.x = alpha^2 - 2 * t.x
+        // T.y = -bias - alpha * T.x
+        let tx = alpha.square() - t.x.double();
+        t.y = -bias - alpha * tx;
+        t.x = tx;
+
+        (ark_bn254::Fq2::ONE, alpha, -bias)
+    }
+
+    fn affine_add_in_place(t: &mut ark_bn254::G2Affine, q: &ark_bn254::G2Affine) -> EllCoeff {
+        // alpha = (t.y - q.y) / (t.x - q.x)
+        // bias = t.y - alpha * t.x
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        let bias = t.y - alpha * t.x;
+
+        // update T
+        // T.x = alpha^2 - t.x - q.x
+        // T.y = -bias - alpha * T.x
+        let tx = alpha.square() - t.x - q.x;
+        t.y = -bias - alpha * tx;
+        t.x = tx;
+
+        (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 {
+                ell_coeffs: vec![],
+                infinity: true,
+            }
+        } else {
+            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 ell_coeffs = vec![];
+            let mut r = q;
+
+            let neg_q = -q;
+
+            for bit in ark_bn254::Config::ATE_LOOP_COUNT.iter().rev().skip(1) {
+                ell_coeffs.push(Self::affine_double_in_place(&mut r, &three_div_two));
+
+                match bit {
+                    1 => ell_coeffs.push(Self::affine_add_in_place(&mut r, &q)),
+                    -1 => ell_coeffs.push(Self::affine_add_in_place(&mut r, &neg_q)),
+                    _ => continue,
+                }
+            }
+
+            let q1 = mul_by_char(q);
+            let mut q2 = mul_by_char(q1);
+
+            if ark_bn254::Config::X_IS_NEGATIVE {
+                r.y = -r.y;
+            }
+
+            q2.y = -q2.y;
+
+            ell_coeffs.push(Self::affine_add_in_place(&mut r, &q1));
+            ell_coeffs.push(Self::affine_add_in_place(&mut r, &q2));
+
+            Self {
+                ell_coeffs,
+                infinity: false,
+            }
+        }
+    }
+}
+
+impl From<ark_bn254::G2Affine> for G2Prepared {
+    // equal with line_function.
+    fn from(q: ark_bn254::G2Affine) -> Self {
+        if q.infinity {
+            G2Prepared {
+                ell_coeffs: vec![],
+                infinity: true,
+            }
+        } else {
+            Self::from_affine(q)
+        }
+    }
+}
+
+impl From<ark_bn254::G2Projective> for G2Prepared {
+    fn from(q: ark_bn254::G2Projective) -> Self {
+        q.into_affine().into()
+    }
+}
+
+impl From<ark_G2Prepared<ark_bn254::Config>> for G2Prepared {
+    fn from(q: ark_G2Prepared<ark_bn254::Config>) -> Self {
+        let ell_coeffs: Vec<(ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2)> = q
+            .ell_coeffs
+            .iter()
+            .map(|f| {
+                let f1: ark_bn254::Fq2 = f.0;
+                let f2: ark_bn254::Fq2 = f.1;
+                let f3: ark_bn254::Fq2 = f.2;
+                (f1, f2, f3)
+            })
+            .collect();
+        G2Prepared {
+            ell_coeffs,
+            infinity: false,
+        }
+    }
+}
+
+impl<'a> From<&'a ark_bn254::G2Affine> for G2Prepared {
+    fn from(other: &'a ark_bn254::G2Affine) -> Self {
+        (*other).into()
+    }
+}
+
+impl<'a> From<&'a ark_bn254::G2Projective> for G2Prepared {
+    fn from(q: &'a ark_bn254::G2Projective) -> Self {
+        q.into_affine().into()
+    }
+}
+
+impl<'a> From<&'a ark_G2Prepared<ark_bn254::Config>> for G2Prepared {
+    fn from(q: &'a ark_G2Prepared<ark_bn254::Config>) -> Self {
+        q.to_owned().into()
+    }
+}
+
+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
+
+    let mut s = r;
+    s.x.frobenius_map_in_place(1);
+    s.x *= &ark_bn254::Config::TWIST_MUL_BY_Q_X;
+    s.y.frobenius_map_in_place(1);
+    s.y *= &ark_bn254::Config::TWIST_MUL_BY_Q_Y;
+
+    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 = pairs
+            .chunks_mut(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_ff::UniformRand;
+    use ark_std::test_rng;
+
+    #[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..ac9abb346
--- /dev/null
+++ b/bitvm/src/bn254/fp254impl.rs
@@ -0,0 +1,604 @@
+use crate::bigint::add::limb_add_carry;
+use crate::bigint::sub::limb_sub_borrow;
+use crate::bigint::U254;
+use crate::treepp::*;
+use ark_ff::PrimeField;
+use bitcoin_script::script;
+use num_bigint::{BigInt, BigUint};
+use num_traits::Num;
+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;
+
+    fn modulus_as_bigint() -> BigInt {
+        BigInt::from_str_radix(Self::MODULUS, 16).unwrap()
+    }
+
+    #[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 equal_keep_elements(a: u32, b: u32) -> Script {
+        U254::equal_keep_elements(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_verify() -> Script {
+        script! {
+            OP_1
+            OP_EQUALVERIFY
+            for _ in 0..Self::N_LIMBS-1 {
+                OP_NOT OP_VERIFY
+            }
+        }
+    }
+
+    fn is_one_keep_element(a: u32) -> Script {
+        script! {
+            { Self::copy(a) }
+            { Self::is_one() }
+        }
+    }
+
+    #[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_SWAP
+                    // ⋯ 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
+                for i in 0..Self::N_LIMBS-1 {
+                    { Self::MODULUS_LIMBS[i as usize] } OP_SWAP
+                    if i == 0 {
+                        { 2_usize.pow(U254::LIMB_SIZE) }
+                    } else {
+                        OP_ROT
+                    }
+                    limb_sub_borrow OP_TOALTSTACK
+                    if i == Self::N_LIMBS-2 {
+                        OP_NIP
+                    } else {
+                        OP_ROT
+                    }
+                    OP_ADD
+                }
+                { Self::MODULUS_LIMBS[Self::N_LIMBS as usize - 1] } OP_SWAP OP_SUB
+                for _ in 0..Self::N_LIMBS-1 {
+                    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
+        }
+    }
+
+    // verifies that the element at the top of the stack is less than the modulo and valid (limbs are in range)
+    // doesn't consume the element, instead sends it to the altstack
+    fn check_validity() -> Script {
+        let limbs_of_c = U254::biguint_to_limbs(Self::modulus_as_bigint().to_biguint().unwrap());
+        script! {
+            // (Assuming limbs are numbered big endian)
+            // Number A is greater than number B <=> there exists a limb i, s.t. (A_i > B_i OR (A_i >= B_i and i is the first limb)) and there's no limb j > i satisfying A_i < B_i
+            // Script below maintains if such state exists for each i behind the foremost limb, combining the results and negating them if there is such j
+            for i in 0..(Self::N_LIMBS as usize) {
+                OP_DUP OP_DUP OP_TOALTSTACK
+                { 0 } { 1 << U254::LIMB_SIZE } OP_WITHIN OP_VERIFY
+                if i == 0 {
+                    { limbs_of_c[i] }
+                    OP_GREATERTHANOREQUAL
+                } else {
+                    { limbs_of_c[i] } OP_2DUP
+                    OP_GREATERTHAN OP_TOALTSTACK
+                    OP_GREATERTHANOREQUAL
+                    OP_BOOLAND
+                    OP_FROMALTSTACK OP_BOOLOR
+                }
+                if i == (Self::N_LIMBS as usize) - 1 {
+                    OP_NOT OP_VERIFY //This OP_NOT can be negated, but it probably isn't necessary
+                } else {
+                    OP_SWAP
+                }
+            }
+        }
+    }
+
+    fn check_validity_and_keep_element() -> Script {
+        script! {
+            { Self::check_validity() }
+            for _ in 0..Self::N_LIMBS {
+                OP_FROMALTSTACK
+            }
+        }
+    }
+
+    // finds if the element at the top of the stack is less than the modulo and valid (limbs are in range)
+    // consumes the element, leaves the result at the topstack
+    fn is_valid() -> Script {
+        let limbs_of_c = U254::biguint_to_limbs(Self::modulus_as_bigint().to_biguint().unwrap());
+        script! {
+            // (Assuming limbs are numbered big endian)
+            // Number A is greater than number B <=> there exists a limb i, s.t. (A_i > B_i OR (A_i >= B_i and i is the first limb)) and there's no limb j > i satisfying A_i < B_i
+            // Script below maintains if such state exists for each i behind the foremost limb, combining the results and negating them if there is such j
+            for i in 0..(Self::N_LIMBS as usize) {
+                OP_DUP
+                { 0 } { 1 << U254::LIMB_SIZE } OP_WITHIN
+                if i == 0 {
+                    OP_TOALTSTACK //u254 validity check
+
+                    { limbs_of_c[i] }
+                    OP_GREATERTHANOREQUAL
+                } else {
+                    OP_FROMALTSTACK OP_BOOLAND OP_TOALTSTACK //u254 validity check
+
+                    { limbs_of_c[i] } OP_2DUP
+                    OP_GREATERTHAN OP_TOALTSTACK
+                    OP_GREATERTHANOREQUAL
+                    OP_BOOLAND
+                    OP_FROMALTSTACK OP_BOOLOR
+                }
+                if i == (Self::N_LIMBS as usize) - 1 {
+                    OP_NOT //This OP_NOT can be negated, but it probably isn't necessary
+                    OP_FROMALTSTACK
+                    OP_BOOLAND
+                } else {
+                    OP_SWAP
+                }
+            }
+        }
+    }
+}
diff --git a/src/bn254/fq.rs b/bitvm/src/bn254/fq.rs
similarity index 59%
rename from src/bn254/fq.rs
rename to bitvm/src/bn254/fq.rs
index f42b14d03..a21fa9a60 100644
--- a/src/bn254/fq.rs
+++ b/bitvm/src/bn254/fq.rs
@@ -1,8 +1,12 @@
-use num_bigint::BigInt;
-use num_traits::{FromPrimitive, Num, ToPrimitive};
+#![allow(clippy::reversed_empty_ranges)]
+use std::str::FromStr;
+
+use num_bigint::{BigInt, BigUint};
+use num_traits::{FromPrimitive, ToPrimitive};
 
 use crate::bigint::BigIntImpl;
 use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::utils::Hint;
 use crate::pseudo::NMUL;
 use crate::treepp::*;
 
@@ -12,22 +16,12 @@ 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,
-    ];
-
     const P_PLUS_ONE_DIV2: &'static str =
         "183227397098d014dc2822db40c0ac2ecbc0b548b438e5469e10460b6c3e7ea4";
 
@@ -40,32 +34,436 @@ impl Fp254Impl for Fq {
 }
 
 impl Fq {
-    pub fn modulus_as_bigint() -> BigInt {
-        BigInt::from_str_radix(Self::MODULUS, 16).unwrap()
-    }
-
     pub fn tmul() -> Script {
-        script!{ 
+        script! {
             { <Fq as Fp254Mul>::tmul() }
         }
     }
 
     pub fn tmul_lc2() -> Script {
-        script!{ 
+        script! {
             { <Fq as Fp254Mul2LC>::tmul() }
         }
     }
-    
-    pub const fn bigint_tmul_lc_1() -> (u32, u32) {
+
+    // Wrapper over 4-bit windowed tmul that computes a linear combination of two terms
+    // Computes r = a * c + b * d (mod p)
+    // Input Stack: [hint, a, b, c, d]
+    // Output Stack: [r]
+    pub fn tmul_lc2_w4() -> Script {
+        script! {
+            { <Fq as Fp254Mul2LCW4>::tmul() }
+        }
+    }
+
+    pub fn tmul_lc4() -> Script {
+        script! {
+            { <Fq as Fp254Mul4LC>::tmul() }
+        }
+    }
+
+    pub const fn bigint_tmul_lc_1() -> (u32, u32, u32) {
         const X: u32 = <Fq as Fp254Mul>::T::N_BITS;
-        const Y: u32 = <Fq as Fp254Mul>::LIMB_SIZE;
-        (X, Y)
+        const Y: u32 = <Fq as Fp254Mul>::T::LIMB_SIZE;
+        const Z: u32 = <Fq as Fp254Mul>::T::N_LIMBS;
+        (X, Y, Z)
     }
 
-    pub const fn bigint_tmul_lc_2() -> (u32, u32) {
+    pub const fn bigint_tmul_lc_2() -> (u32, u32, u32) {
         const X: u32 = <Fq as Fp254Mul2LC>::T::N_BITS;
-        const Y: u32 = <Fq as Fp254Mul2LC>::LIMB_SIZE;
-        (X, Y)
+        const Y: u32 = <Fq as Fp254Mul2LC>::T::LIMB_SIZE;
+        const Z: u32 = <Fq as Fp254Mul2LC>::T::N_LIMBS;
+        (X, Y, Z)
+    }
+
+    pub const fn bigint_tmul_lc_2_w4() -> (u32, u32, u32) {
+        const X: u32 = <Fq as Fp254Mul2LCW4>::T::N_BITS;
+        const Y: u32 = <Fq as Fp254Mul2LCW4>::T::LIMB_SIZE;
+        const Z: u32 = <Fq as Fp254Mul2LCW4>::T::N_LIMBS;
+        (X, Y, Z)
+    }
+
+    pub const fn bigint_tmul_lc_4() -> (u32, u32, u32) {
+        const X: u32 = <Fq as Fp254Mul4LC>::T::N_BITS;
+        const Y: u32 = <Fq as Fp254Mul4LC>::T::LIMB_SIZE;
+        const Z: u32 = <Fq as Fp254Mul4LC>::T::N_LIMBS;
+        (X, Y, Z)
+    }
+
+    #[inline]
+    pub fn push(a: ark_bn254::Fq) -> Script {
+        script! {
+            { Fq::push_u32_le(&BigUint::from(a).to_u32_digits()) }
+        }
+    }
+
+    pub 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
+    pub 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)
+    }
+
+    pub 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)]
+    pub 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)
+    }
+
+    // Assumes tmul hint (1 BigInteger) at the top of stack
+    // and operands (a, b, c, d) at stack depths (a_depth, b_depth, c_depth, d_depth)
+    // Computes r = a * c + b * d (mod p)
+    #[allow(clippy::too_many_arguments)]
+    pub fn hinted_mul_lc2_w4(
+        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::with_capacity(1);
+
+        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_w4() }
+        };
+        hints.push(Hint::BigIntegerTmulLC2(q));
+
+        (script, hints)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub 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)]
+    pub 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)
+    }
+
+    // Same as hinted_mul_lc2_keep_elements(), except retains operands (a, b, c, d) on stack
+    #[allow(clippy::too_many_arguments)]
+    pub fn hinted_mul_lc2_keep_elements_w4(
+        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::with_capacity(1);
+
+        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_w4() }
+        };
+        hints.push(Hint::BigIntegerTmulLC2(q));
+
+        (script, hints)
+    }
+
+    // TODO: Optimize using the sqaure feature
+    pub 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)
+    }
+
+    pub 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)
     }
 }
 
@@ -92,7 +490,7 @@ macro_rules! fp_lc_mul {
             trait [<Fp254 $NAME>] {
                 const LIMB_SIZE: u32 = 29;
                 const LCS: [bool; $LCS.len()] = $LCS;
-                const LC_BITS: u32 = usize::BITS - $LCS.len().leading_zeros() - 1;
+                const LC_BITS: u32 = usize::BITS - ($LCS.len() - 1).leading_zeros();
                 type U;
                 type T;
                 fn tmul() -> Script;
@@ -119,8 +517,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;
@@ -149,15 +547,15 @@ macro_rules! fp_lc_mul {
                     // Initialize the lookup table
                     fn init_table(window: u32) -> Script {
                         assert!(
-                            1 <= window && window <= 6,
-                            "expected 1<=window<=6; got window={}",
+                            (2..=6).contains(&window),
+                            "expected 2<=window<=6; got window={}",
                             window
                         );
                         script! {
                             for i in 2..=window {
                                 for j in 1 << (i - 1)..1 << i {
                                     if j % 2 == 0 {
-                                        { T::double_allow_overflow_keep_element( (j/2 - 1) * T::N_LIMBS ) }
+                                        { T::double_prevent_overflow_keep_element(j/2 - 1) }
                                     } else {
                                         { T::add_ref_with_top(j - 2) }
                                     }
@@ -210,7 +608,7 @@ macro_rules! fp_lc_mul {
                                 } else {
                                     OP_FROMALTSTACK // load accumulator from altstack
                                 }
-                                
+
                                 if (e_bit % LIMB_SIZE == 0) || (s_limb > e_limb) {
                                     if s_limb > e_limb {
                                         { NMUL(2) }
@@ -251,7 +649,7 @@ macro_rules! fp_lc_mul {
                                             OP_ENDIF
                                             if i < VAR_WIDTH - 1 { { NMUL(2) } }
                                             OP_SWAP
-                                        } else { 
+                                        } else {
                                             OP_TUCK
                                             { (1 << ((s_bit - i) % LIMB_SIZE)) - 1 }
                                             OP_GREATERTHAN
@@ -303,9 +701,10 @@ macro_rules! fp_lc_mul {
                             { U::lessthan(1, 0) } OP_VERIFY                                // {q} {x0} {x1} {y0} {y1}
                             { U::toaltstack() }                                            // {q} {x0} {x1} {y0} -> {y1}
                         }                                                                  // {q} -> {x0} {x1} {y0} {y1}
-                        // Pre-compute lookup tables
-                        { T::push_zero() }                   // {q} {0} -> {x0} {x1} {y0} {y1}
-                        { T::sub(0, 1) }                     // {-q} -> {x0} {x1} {y0} {y1}
+                        // ensure q is a valid bigint
+                        { T::copy(0) } { T::check_validity() }
+                        // Pre-compute lookup tables (q can not be 2^T::N_BITS-1 when tmul is correctly used, so neg() gives correct result)
+                        { T::neg() }                         // {-q} -> {x0} {x1} {y0} {y1}
                         { init_table(MOD_WIDTH) }            // {-q_table} -> {x0} {x1} {y0} {y1}
                         for i in 0..N_LC {
                             { U::fromaltstack() }            // {-q_table} {x0} -> {x1} {y0} {y1}
@@ -338,12 +737,12 @@ macro_rules! fp_lc_mul {
                                         OP_SWAP
                                         OP_SUB
                                         if i + j == MAIN_LOOP_START && j == 0 {
-                                            for _ in 0..Self::N_LIMBS {
+                                            for _ in 0..T::N_LIMBS {
                                                 OP_NIP
                                             }
-                                            { NMUL(Self::N_LIMBS) }
+                                            { NMUL(T::N_LIMBS) }
                                             OP_DUP OP_PICK
-                                            for _ in 0..Self::N_LIMBS-1 {
+                                            for _ in 0..T::N_LIMBS-1 {
                                                 OP_SWAP
                                                 OP_DUP OP_PICK
                                             }
@@ -370,25 +769,22 @@ macro_rules! fp_lc_mul {
                             }
                         }
 
-                        { T::is_positive(size_table(MOD_WIDTH) +                 // q was negative
-                            N_LC * size_table(VAR_WIDTH) + N_LC) } OP_TOALTSTACK // {-q_table} {x0_table} {x1_table} {y0} {y1} {r} -> {0/1}
-                        { T::toaltstack() }                                      // {-q_table} {x0_table} {x1_table} {y0} {y1} -> {r} {0/1}
+                        { T::toaltstack() }                                            // {-q_table} {x0_table} {x1_table} {y0} {y1} -> {r}
 
                         // Cleanup
-                        for _ in 0..N_LC { { T::drop() } }             // {-q_table} {x0_table} {x1_table} -> {r} {0/1}
-                        for _ in 0..N_LC { { drop_table(VAR_WIDTH) } } // {-q_table} -> {r} {0/1}
-                        { drop_table(MOD_WIDTH) }                      // -> {r} {0/1}
+                        for _ in 0..N_LC { { T::drop() } }                             // {-q_table} {x0_table} {x1_table} -> {r}
+                        for _ in 0..N_LC { { drop_table(VAR_WIDTH) } }                 // {-q_table} -> {r}
+                        { drop_table(MOD_WIDTH) }                                      // -> {r}
 
                         // Correction/validation
                         // r = if q < 0 { r + p } else { r }; assert(r < p)
-                        { T::push_u32_le(&Fq::modulus_as_bigint().to_u32_digits().1) } // {MODULUS} -> {r} {0/1}
-                        { T::fromaltstack() } OP_FROMALTSTACK // {MODULUS} {r} {0/1}
-                        OP_IF { T::add_ref(1) } OP_ENDIF      // {MODULUS} {-r/r}
-                        { T::copy(0) }                        // {MODULUS} {-r/r} {-r/r}
-                        { T::lessthan(0, 2) } OP_VERIFY       // {-r/r}
+                        { T::push_u32_le(&Fq::modulus_as_bigint().to_u32_digits().1) } // {MODULUS} -> {r}
+                        { T::fromaltstack() }                                          // {MODULUS} {r}
+                        { T::copy(0) }                                                 // {MODULUS} {r} {r}
+                        { T::lessthan(0, 2) } OP_VERIFY                                // {r}
 
                         // Resize res back to N_BITS
-                        { T::resize::<N_BITS>() } // {r}
+                        { T::resize::<N_BITS>() }                                      // {r}
                     }
                 }
             }
@@ -398,40 +794,47 @@ macro_rules! fp_lc_mul {
 
 fp_lc_mul!(Mul, 4, 4, [true]);
 fp_lc_mul!(Mul2LC, 3, 3, [true, true]);
+fp_lc_mul!(Mul2LCW4, 4, 4, [true, true]);
+fp_lc_mul!(Mul4LC, 3, 3, [true, true, true, true]);
 
 #[cfg(test)]
 mod test {
-    use crate::bn254::utils::fq_push_not_montgomery;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fp254impl::Fp254Impl;
+    use super::*;
     use crate::bigint::U254;
-    use crate::treepp::*;
-    use ark_ff::{BigInteger, Field, PrimeField};
-    use ark_std::UniformRand;
-
+    use crate::bn254::fq::Fq;
+    use crate::{bn254::fp254impl::Fp254Impl, ExecuteInfo};
     use ark_ff::AdditiveGroup;
+    use ark_ff::Field;
+    use ark_std::UniformRand;
     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 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()) }
         };
-        run(script);
+
+        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]
@@ -512,160 +915,6 @@ mod test {
         }
     }
 
-    #[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
-            };
-            run(script);
-        }
-        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
-        };
-        run(script);
-    }
-
-    #[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) * BigUint::from(b)) - BigUint::from(r))
-                / q_big.clone();
-            let p = ark_bn254::Fq::from(p);
-
-            let script = script! {
-                { U254::push_u32_le(&BigUint::from(a).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(b).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(p).to_u32_digits()) }
-                { Fq::mul_bucket() }
-                { U254::push_u32_le(&BigUint::from(r).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) * BigUint::from(b)) - BigUint::from(r))
-                / q_big.clone();
-            let p = ark_bn254::Fq::from(p);
-
-            let script = script! {
-                { U254::push_u32_le(&BigUint::from(a).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(p).to_u32_digits()) }
-                { Fq::mul_by_constant_bucket(&b) }
-                { U254::push_u32_le(&BigUint::from(r).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
-            };
-            run(script);
-        }
-    }
-
     #[test]
     fn test_neg() {
         println!("Fq.neg: {} bytes", Fq::neg(0).len());
@@ -687,26 +936,6 @@ mod test {
         }
     }
 
-    #[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
-            };
-            run(script);
-        }
-    }
-
     #[test]
     fn test_div2() {
         println!("Fq.div2: {} bytes", Fq::div2().len());
@@ -750,7 +979,7 @@ mod test {
 
     #[test]
     fn test_is_one() {
-        println!("Fq.is_one: {} bytes", Fq::is_one(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()
@@ -759,12 +988,11 @@ mod test {
             { Fq::push_one() }
             { Fq::is_one_keep_element(0) }
             OP_TOALTSTACK
-            { Fq::is_one(0) }
+            { Fq::is_one() }
             OP_FROMALTSTACK
             OP_BOOLAND
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 
     #[test]
@@ -811,134 +1039,29 @@ mod test {
         }
     }
 
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_is_field() {
-        let m = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        println!("Fq.is_field: {} bytes", Fq::is_field().len());
-
-        for _ in 0..10 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let a = a.rem(&m);
-
-            let script = script! {
-                { Fq::push_u32_le(&a.to_u32_digits()) }
-                { Fq::is_field() }
-            };
-            run(script);
-        }
-
-        let script = script! {
-            { Fq::push_modulus() } OP_1 OP_ADD
-            { Fq::is_field() }
-            OP_NOT
-        };
-        run(script);
-
-        let script = script! {
-            { Fq::push_modulus() } OP_1 OP_SUB
-            OP_NEGATE
-            { Fq::is_field() }
-            OP_NOT
-        };
-        run(script);
-    }
-
-    #[test]
-    fn test_convert_to_be_bytes() {
-        let mut prng = 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..10 {
-            let fq = ark_bn254::Fq::rand(&mut prng);
-            let bytes = fq.into_bigint().to_bytes_be();
-
-            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
-                }
-                OP_TRUE
-            };
-            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);
-        }
-        bools
-    }
-
     #[test]
     fn test_hinted_mul() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 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, hints) = Fq::hinted_mul(1, a, 0, b);
+            println!("Fq::hinted_mul: {} bytes", hinted_mul.len());
 
             let script = script! {
-                for hint in hints { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
-                { fq_push_not_montgomery(b) }
+                { Fq::push(a) }
+                { Fq::push(b) }
                 { hinted_mul.clone() }
-                { fq_push_not_montgomery(c) }
+                { Fq::push(c) }
                 { Fq::equal(0, 1) }
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_mul: {} @ {} stack", hinted_mul.len(), max_stack);
+            run(script);
         }
     }
 
@@ -946,34 +1069,29 @@ mod test {
     fn test_hinted_mul_keep_element() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 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, hints) = Fq::hinted_mul_keep_element(1, a, 0, 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 { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
-                { fq_push_not_montgomery(b) }
-                { hinted_mul.clone() }
-                { fq_push_not_montgomery(c) }
+                { 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
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_mul_keep_element: {} @ {} stack", hinted_mul.len(), max_stack);
+            run(script);
         }
     }
 
@@ -981,29 +1099,27 @@ mod test {
     fn test_hinted_mul_by_constant() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 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, hints) = Fq::hinted_mul_by_constant(a, &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 { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
-                { hinted_mul.clone() }
-                { fq_push_not_montgomery(c) }
+                { Fq::push(a) }
+                { hinted_mul_by_constant.clone() }
+                { Fq::push(c) }
                 { Fq::equal(0, 1) }
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_mul_by_constant: {} @ {} stack", hinted_mul.len(), max_stack);
+            run(script);
         }
     }
 
@@ -1011,8 +1127,6 @@ mod test {
     fn test_hinted_mul_lc2() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 0;
-
         for _ in 0..100 {
             let a = ark_bn254::Fq::rand(&mut prng);
             let b = ark_bn254::Fq::rand(&mut prng);
@@ -1021,24 +1135,21 @@ mod test {
             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 { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
-                { fq_push_not_montgomery(b) }
-                { fq_push_not_montgomery(c) }
-                { fq_push_not_montgomery(d) }
+                { Fq::push(a) }
+                { Fq::push(b) }
+                { Fq::push(c) }
+                { Fq::push(d) }
                 { hinted_mul_lc2.clone() }
-                { fq_push_not_montgomery(e) }
+                { Fq::push(e) }
                 { Fq::equal(0, 1) }
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_mul_lc2: {} @ {} stack", hinted_mul_lc2.len(), max_stack);
+            run(script);
         }
     }
 
@@ -1046,8 +1157,6 @@ mod test {
     fn test_hinted_mul_lc2_keep_elements() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 0;
-
         for _ in 0..100 {
             let a = ark_bn254::Fq::rand(&mut prng);
             let b = ark_bn254::Fq::rand(&mut prng);
@@ -1055,18 +1164,23 @@ mod test {
             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_keep_elements(3, a, 2, b, 1, c, 0, 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 { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
-                { fq_push_not_montgomery(b) }
-                { fq_push_not_montgomery(c) }
-                { fq_push_not_montgomery(d) }
-                { hinted_mul_lc2.clone() }
-                { fq_push_not_montgomery(e) }
+                { 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() }
@@ -1075,11 +1189,7 @@ mod test {
                 { Fq::drop() }
                 OP_FROMALTSTACK
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_mul_lc2: {} @ {} stack", hinted_mul_lc2.len(), max_stack);
+            run(script);
         }
     }
 
@@ -1087,30 +1197,24 @@ mod test {
     fn test_hinted_square() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 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 { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq_push_not_montgomery(a) }
+                { Fq::push(a) }
                 { hinted_square.clone() }
-                { fq_push_not_montgomery(c) }
+                { Fq::push(c) }
                 { Fq::equal(0, 1) }
             };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq::hinted_square: {} @ {} stack", hinted_square.len(), max_stack);
+            run(script);
         }
-
     }
 
     #[test]
@@ -1127,14 +1231,13 @@ mod test {
             for hint in hints {
                 { hint.push() }
             }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(a).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(a).to_u32_digits()) }
             { hinted_inv }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(c).to_u32_digits()) }
+            { 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);
     }
 
     #[test]
@@ -1278,4 +1381,159 @@ mod test {
             max_stack
         );
     }
+
+    #[test]
+    fn test_check_validity() {
+        let mut prng = ChaCha20Rng::seed_from_u64(37);
+        let x = Fq::modulus_as_bigint().to_biguint().unwrap();
+        let verification_script = Fq::check_validity();
+        let clearing_script = script! {
+            for _ in 0..U254::N_LIMBS { OP_FROMALTSTACK }
+            { U254::equalverify(0, 1) }
+            OP_TRUE
+        };
+
+        // -1
+        {
+            run(script! {
+                { U254::push_biguint(x.clone() - 1u32) }
+                { verification_script.clone() }
+                { U254::push_biguint(x.clone() - 1u32) }  { clearing_script.clone() }
+            })
+        }
+
+        // equal
+        {
+            assert!(
+                execute_script(script! {
+                    { U254::push_biguint(x.clone()) }
+                    { verification_script.clone() }
+                    { U254::push_biguint(x.clone()) }  { clearing_script.clone() }
+                })
+                .success
+                    == false
+            )
+        }
+
+        // +1
+        {
+            assert!(
+                execute_script(script! {
+                    { U254::push_biguint(x.clone() + 1u32) }
+                    { verification_script.clone() }
+                    { U254::push_biguint(x.clone() + 1u32) }  { clearing_script.clone() }
+                })
+                .success
+                    == false
+            )
+        }
+
+        // random less than
+        for _ in 0..100 {
+            let n = prng.gen_biguint_range(&BigUint::from(0u32), &x);
+            run(script! {
+                { U254::push_biguint(n.clone()) }
+                { verification_script.clone() }
+                { U254::push_biguint(n) }  { clearing_script.clone() }
+            })
+        }
+
+        // random geq
+        for _ in 0..100 {
+            let n = prng.gen_biguint_range(&x, &BigUint::from(2u32).pow(254));
+            assert!(
+                execute_script(script! {
+                    { U254::push_biguint(n.clone()) }
+                    { verification_script.clone() }
+                    { U254::push_biguint(n) }  { clearing_script.clone() }
+                })
+                .success
+                    == false
+            );
+        }
+
+        //corrupted data with negative
+        {
+            let limbs = U254::biguint_to_limbs(x.clone());
+            assert!(
+                execute_script(script! {
+                    for i in (1..U254::N_LIMBS as usize).rev() {
+                        { limbs[i] }
+                    }
+                    { -1 }
+
+                    { verification_script.clone() }
+                    { U254::push_biguint(x.clone()) }  { clearing_script.clone() }
+                })
+                .success
+                    == false
+            )
+        }
+    }
+
+    #[test]
+    fn test_is_valid() {
+        let mut prng = ChaCha20Rng::seed_from_u64(37);
+        let x = Fq::modulus_as_bigint().to_biguint().unwrap();
+        let verification_script = Fq::is_valid();
+
+        // -1
+        {
+            run(script! {
+                { U254::push_biguint(x.clone() - 1u32) }
+                { verification_script.clone() }
+            })
+        }
+
+        // equal
+        {
+            run(script! {
+                { U254::push_biguint(x.clone()) }
+                { verification_script.clone() }
+                OP_NOT
+            })
+        }
+
+        // +1
+        {
+            run(script! {
+                { U254::push_biguint(x.clone() + 1u32) }
+                { verification_script.clone() }
+                OP_NOT
+            })
+        }
+
+        // random less than
+        for _ in 0..100 {
+            let n = prng.gen_biguint_range(&BigUint::from(0u32), &x);
+            run(script! {
+                { U254::push_biguint(n.clone()) }
+                { verification_script.clone() }
+            })
+        }
+
+        // random geq
+        for _ in 0..100 {
+            let n = prng.gen_biguint_range(&x, &BigUint::from(2u32).pow(254));
+            run(script! {
+                { U254::push_biguint(n.clone()) }
+                { verification_script.clone() }
+                OP_NOT
+            });
+        }
+
+        //corrupted data with negative
+        {
+            let limbs = U254::biguint_to_limbs(x.clone());
+            run(script! {
+                for i in (1..U254::N_LIMBS as usize).rev() {
+                    { limbs[i] }
+                }
+                { -1 }
+
+                { verification_script.clone() }
+                OP_NOT
+            })
+        }
+    }
 }
diff --git a/bitvm/src/bn254/fq12.rs b/bitvm/src/bn254/fq12.rs
new file mode 100644
index 000000000..e1fc5872b
--- /dev/null
+++ b/bitvm/src/bn254/fq12.rs
@@ -0,0 +1,461 @@
+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)
+    }
+
+    pub fn check_validity() -> Script {
+        script! {
+            for _ in 0..2 {
+                { Fq6::check_validity() }
+            }
+        }
+    }
+}
+
+#[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/src/bn254/fq2.rs b/bitvm/src/bn254/fq2.rs
similarity index 53%
rename from src/bn254/fq2.rs
rename to bitvm/src/bn254/fq2.rs
index 456928ed1..0483d6c4a 100644
--- a/src/bn254/fq2.rs
+++ b/bitvm/src/bn254/fq2.rs
@@ -1,102 +1,76 @@
 use crate::bn254::fp254impl::Fp254Impl;
 use crate::bn254::fq::Fq;
+use crate::bn254::utils::Hint;
 use crate::treepp::{script, Script};
 use ark_ff::Fp2Config;
-use std::ops::Add;
-
-use utils::Hint;
-
-use super::utils;
+use num_bigint::BigUint;
 
 pub struct Fq2;
 
 impl Fq2 {
-    pub fn add(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
+    pub fn copy(a: u32) -> Script {
+        script! {
+            { Fq::copy(a + 1) }
+            { Fq::copy(a + 1) }
         }
+    }
 
+    pub fn roll(a: u32) -> Script {
         script! {
-            { Fq::add(a + 1, b + 1) }
-            { Fq::add(a, b + 1) }
+            { Fq::roll(a + 1) }
+            { Fq::roll(a + 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 drop() -> Script {
+        script! {
+            { Fq::drop() }
+            { Fq::drop() }
         }
     }
 
-    pub fn double(a: u32) -> Script {
+    pub fn toaltstack() -> Script {
         script! {
-            { Fq::double(a + 1) }
-            { Fq::double(a + 1) }
+            { Fq::toaltstack() }
+            { Fq::toaltstack() }
         }
     }
 
-    /// Square the top Fq2 element
-    ///
-    /// Optimized by: @Hakkush-07
-    pub fn square() -> Script {
+    pub fn fromaltstack() -> 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) }
+            { Fq::fromaltstack() }
+            { Fq::fromaltstack() }
         }
     }
 
-    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 mut script = script! {};
-        let script_lines = [
-            // 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
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
+    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()) }
         }
+    }
 
-        hints.extend(hint1);
-        hints.extend(hint2);
-        (script, hints)
+    pub fn push_zero() -> Script {
+        script! {
+            { Fq::push_zero() }
+            { Fq::push_zero() }
+        }
     }
 
-    pub fn copy(a: u32) -> Script {
+    pub fn push_one() -> Script {
         script! {
-            { Fq::copy(a + 1) }
-            { Fq::copy(a + 1) }
+            { 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(),
         }
     }
 
@@ -116,102 +90,62 @@ impl Fq2 {
             OP_BOOLAND
         }
     }
-    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 {
+    pub fn add(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) }
+            { Fq::add(a + 1, b + 1) }
+            { Fq::add(a, b + 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);
+    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) }
+            }
         }
-        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 mul_by_fq(mut a: u32, b: u32) -> Script {
-        if a < b {
-            a += 1;
-        }
-
+    pub fn double(a: u32) -> Script {
         script! {
-            { Fq::copy(b) }
-            { Fq::roll(a + 2) }
-
-            { Fq::mul() }
-            { Fq::roll(b + 1) }
-            { Fq::roll(a + 1) }
-
-            { Fq::mul() }
+            { Fq::double(a + 1) }
+            { Fq::double(a + 1) }
         }
     }
 
-    pub fn push_one() -> Script {
+    pub fn triple(a: u32) -> Script {
         script! {
-            { Fq::push_one() }
-            { Fq::push_zero() }
+            { Fq2::copy(a) }
+            { Fq2::double(a + 2) }
+            { Fq2::add(2, 0) }
         }
     }
 
-    pub fn push_one_not_montgomery() -> Script {
+    pub fn div2() -> Script {
         script! {
-            { Fq::push_one_not_montgomery() }
-            { Fq::push_zero() }
+            { Fq::roll(1) }
+            { Fq::div2() }
+            { Fq::roll(1) }
+            { Fq::div2() }
         }
     }
 
-    pub fn push_zero() -> Script {
+    pub fn div3() -> Script {
         script! {
-            { Fq::push_zero() }
-            { Fq::push_zero() }
+            { Fq::roll(1) }
+            { Fq::div3() }
+            { Fq::roll(1) }
+            { Fq::div3() }
         }
     }
 
@@ -222,117 +156,117 @@ impl Fq2 {
         }
     }
 
-    pub fn inv() -> Script {
+    pub fn check_validity_and_keep_element() -> Script {
         script! {
-            // copy c1
-            { Fq::copy(0) }
-
-            // compute v1 = c1^2
-            { Fq::square() }
+            { Fq::check_validity() }
+            { Fq::check_validity_and_keep_element() }
+            for _ in 0..Fq::N_LIMBS {
+                OP_FROMALTSTACK
+            }
+        }
+    }
 
-            // copy c0
-            { Fq::copy(2) }
+    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);
 
-            // compute v0 = c0^2 + v1
-            { Fq::square() }
-            { Fq::add(1, 0) }
+        let mut hints = Vec::new();
 
-            // compute inv v0
-            { Fq::inv() }
+        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);
 
-            // dup inv v0
-            { Fq::copy(0) }
+        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
+        };
 
-            // compute c0
-            { Fq::roll(3) }
-            { Fq::mul() }
+        hints.extend(hint1);
+        hints.extend(hint2);
 
-            // compute c1
-            { Fq::roll(2) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::neg(0) }
-        }
+        (script, hints)
     }
 
-    pub fn div2() -> Script {
-        script! {
-            { Fq::roll(1) }
-            { Fq::div2() }
-            { Fq::roll(1) }
-            { Fq::div2() }
+    // Given Fq2 elements a and b, compute their product
+    // A = a0 + a1 u, B = b0 + b1 u, where $u^2$ is quadratic non-residue, for bn-254 $u^2$ = -1
+    // A.B = (a0.b0 + a1.b1 $u^2$) + u (a0.b1 + a1b0) = (a0.b0 - a1.b1) + u (a0.b1 + a1.b0)
+    // This specific version uses tmul of 4-bit window to compute each of the two terms above.
+    pub fn hinted_mul_w4(
+        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);
 
-    pub fn div3() -> Script {
-        script! {
-            { Fq::roll(1) }
-            { Fq::div3() }
-            { Fq::roll(1) }
-            { Fq::div3() }
-        }
-    }
+        let mut hints = Vec::with_capacity(2);
 
-    pub fn triple(a: u32) -> Script {
-        script! {
-            { Fq2::copy(a) }
-            { Fq2::double(a + 2) }
-            { Fq2::add(2, 0) }
-        }
-    }
+        let (hinted_script1, hint1) =
+            Fq::hinted_mul_lc2_keep_elements_w4(3, a.c0, 2, a.c1, 1, b.c1, 0, b.c0);
+        let (hinted_script2, hint2) = Fq::hinted_mul_lc2_w4(3, a.c0, 2, a.c1, 1, b.c0, 0, -b.c1);
 
-    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()]) }
-        }
-    }
+        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
+        };
 
-    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()])
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        (script, hints)
     }
 
-    pub fn mul_by_constant(constant: &ark_bn254::Fq2) -> Script {
-        script! {
+    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) }
-            { Fq::mul_by_constant(&constant.c0) }
+            { hinted_script1 }
             { Fq::copy(1) }
-            { Fq::mul_by_constant(&constant.c1) }
+            { hinted_script2 }
             { Fq::add(3, 2) }
-            { Fq::mul_by_constant(&constant.c0.add(constant.c1)) }
+            { hinted_script3 }
             { Fq::copy(2) }
             { Fq::copy(2) }
             { Fq::add(1, 0) }
             { Fq::sub(1, 0) }
             { Fq::sub(2, 1) }
             { Fq::roll(1) }
-        }
-    }
-
-    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 mut script = script! {};
-        let script_lines = [
-            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),
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
+        };
 
         hints.extend(hint1);
         hints.extend(hint2);
@@ -341,75 +275,111 @@ impl Fq2 {
         (script, hints)
     }
 
-    pub fn hinted_mul_by_constant_stable(a: ark_bn254::Fq2, constant: &ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+    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_by_constant_stable(a.c0, &constant.c0);
-        let (hinted_script2, hint2) = Fq::hinted_mul_by_constant_stable(a.c1, &constant.c1);
-        let (hinted_script3, hint3) = Fq::hinted_mul_by_constant_stable(a.c0+a.c1, &(constant.c0+constant.c1));
-
-        let mut script = script! {};
-        let script_lines = [
-            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),
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
+        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);
-        hints.extend(hint3);
 
         (script, hints)
     }
 
-    pub fn toaltstack() -> Script {
-        script! {
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-        }
+    /// 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 fromaltstack() -> Script {
-        script! {
-            { Fq::fromaltstack() }
-            { Fq::fromaltstack() }
-        }
+    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()],
+        )
     }
 
-    pub fn drop() -> Script {
+    pub fn check_validity() -> Script {
         script! {
-            { Fq::drop() }
-            { Fq::drop() }
+            for _ in 0..2 {
+                { Fq::check_validity() }
+            }
         }
     }
 }
 
 #[cfg(test)]
 mod test {
-    use crate::bn254::fq::Fq;
     use crate::bn254::fq2::Fq2;
-    use crate::bn254::utils::fq2_push_not_montgomery;
-    use crate::bn254::{fp254impl::Fp254Impl, utils::fq2_push};
     use crate::treepp::*;
+    use ark_ff::AdditiveGroup;
     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() {
@@ -422,20 +392,20 @@ mod test {
             let c = a + b;
 
             let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
+                { Fq2::push(a) }
+                { Fq2::push(b) }
                 { Fq2::add(2, 0) }
-                { fq2_push(c) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
             run(script);
 
             let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
+                { Fq2::push(a) }
+                { Fq2::push(b) }
                 { Fq2::add(0, 2) }
-                { fq2_push(c) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -454,20 +424,20 @@ mod test {
             let c = a - b;
 
             let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
+                { Fq2::push(a) }
+                { Fq2::push(b) }
                 { Fq2::sub(2, 0) }
-                { fq2_push(c) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
             run(script);
 
             let script = script! {
-                { fq2_push(b) }
-                { fq2_push(a) }
+                { Fq2::push(b) }
+                { Fq2::push(a) }
                 { Fq2::sub(0, 2) }
-                { fq2_push(c) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -485,9 +455,9 @@ mod test {
             let c = a.double();
 
             let script = script! {
-                { fq2_push(a) }
+                { Fq2::push(a) }
                 { Fq2::double(0) }
-                { fq2_push(c) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -496,85 +466,19 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_hinted_mul() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 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);
-
-            let script = script! {
-                for hint in hints { 
-                    { hint.push() }
-                }
-                { fq2_push_not_montgomery(a) }
-                { fq2_push_not_montgomery(b) }
-                { hinted_mul.clone() }
-                { fq2_push_not_montgomery(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq2::hinted_mul: {} @ {} stack", hinted_mul.len(), max_stack);
-        }
-
-    }
-
-    #[test]
-    fn test_bn254_fq2_hinted_mul_by_constant() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 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_by_constant(a, &b);
-
-            let script = script! {
-                for hint in hints { 
-                    { hint.push() }
-                }
-                { fq2_push_not_montgomery(a) }
-                { hinted_mul.clone() }
-                { fq2_push_not_montgomery(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq2::hinted_mul_by_constant: {} @ {} stack", hinted_mul.len(), max_stack);
-        }
-
-    }
-
-    #[test]
-    fn test_bn254_fq2_mul() {
-        println!("Fq2.mul: {} bytes", Fq2::mul(1, 0).len());
+    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 = ark_bn254::Fq2::rand(&mut prng);
-            let c = a.mul(&b);
+            let b = a.double();
+            let c = a.add(b);
 
             let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
-                { Fq2::mul(2, 0) }
-                { fq2_push(c) }
+                { Fq2::push(a) }
+                { Fq2::triple(0) }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -583,21 +487,18 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_mul_by_fq() {
-        println!("Fq2.mul_by_fq: {} bytes", Fq2::mul_by_fq(1, 0).len());
+    fn test_bn254_fq2_div2() {
+        println!("Fq2.div2: {} bytes", Fq2::div2().len());
         let mut prng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..10 {
+        for _ in 0..1 {
             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 b = a.double();
 
             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::push(b) }
+                { Fq2::div2() }
+                { Fq2::push(a) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -606,18 +507,19 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_inv() {
-        println!("Fq2.inv: {} bytes", Fq2::inv().len());
+    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.inverse().unwrap();
+            let b = a.double();
+            let c = a.add(b);
 
             let script = script! {
-                { fq2_push(a) }
-                { Fq2::inv() }
-                { fq2_push(b) }
+                { Fq2::push(c) }
+                { Fq2::div3() }
+                { Fq2::push(a) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -626,18 +528,25 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_square() {
-        println!("Fq2.square: {} bytes", Fq2::square().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+    fn test_bn254_fq2_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..10 {
+        for _ in 0..100 {
             let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.square();
+            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! {
-                { fq2_push(a) }
-                { Fq2::square() }
-                { fq2_push(b) }
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { Fq2::push(b) }
+                { hinted_mul.clone() }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -646,49 +555,25 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_hinted_square() {
+    fn test_bn254_fq2_hinted_mul_w4() {
         let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let mut max_stack = 0;
-
         for _ in 0..100 {
             let a = ark_bn254::Fq2::rand(&mut prng);
-            let c = a.mul(&a);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.mul(&b);
 
-            let (hinted_square, hints) = Fq2::hinted_square(a);
+            let (hinted_mul, hints) = Fq2::hinted_mul_w4(2, a, 0, b);
+            println!("Fq2::hinted_mul_w4: {} bytes", hinted_mul.len());
 
             let script = script! {
-                for hint in hints { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq2_push_not_montgomery(a) }
-                { hinted_square.clone() }
-                { fq2_push_not_montgomery(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq2::hinted_square: {} @ {} stack", hinted_square.len(), max_stack);
-        }
-
-    }
-
-    #[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::push(a) }
+                { Fq2::push(b) }
+                { hinted_mul.clone() }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -697,40 +582,27 @@ mod test {
     }
 
     #[test]
-    fn test_bn254_fq2_div3() {
-        println!("Fq2.div3: {} bytes", Fq2::div3().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+    fn test_bn254_fq2_hinted_mul_by_constant() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..1 {
+        for _ in 0..100 {
             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_triple() {
-        println!("Fq2.triple: {} bytes", Fq2::triple(0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.mul(&b);
 
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.double();
-            let c = a.add(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! {
-                { fq2_push(a) }
-                { Fq2::triple(0) }
-                { fq2_push(c) }
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_mul_by_constant.clone() }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -739,37 +611,23 @@ mod test {
     }
 
     #[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);
+    fn test_bn254_fq2_hinted_square() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..3 {
+        for _ in 0..100 {
             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
-            };
-            run(script);
+            let c = a.mul(&a);
 
-            let b = a.frobenius_map(1);
+            let (hinted_square, hints) = Fq2::hinted_square(a);
+            println!("Fq2::hinted_square: {} bytes", hinted_square.len());
 
             let script = script! {
-                { fq2_push(a) }
-                { Fq2::frobenius_map(1) }
-                { fq2_push(b) }
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_square.clone() }
+                { Fq2::push(c) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
@@ -786,38 +644,42 @@ mod test {
             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());
+            println!(
+                "Fq2.hinted_frobenius_map(0): {} bytes",
+                hinted_frobenius_map_0.len()
+            );
 
             let script = script! {
-                for hint in hints { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq2_push_not_montgomery(a) }
+                { Fq2::push(a) }
                 { hinted_frobenius_map_0 }
-                { fq2_push_not_montgomery(b) }
+                { Fq2::push(b) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            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());
+            println!(
+                "Fq2.hinted_frobenius_map(1): {} bytes",
+                hinted_frobenius_map_1.len()
+            );
 
             let script = script! {
-                for hint in hints { 
+                for hint in hints {
                     { hint.push() }
                 }
-                { fq2_push_not_montgomery(a) }
+                { Fq2::push(a) }
                 { hinted_frobenius_map_1 }
-                { fq2_push_not_montgomery(b) }
+                { Fq2::push(b) }
                 { Fq2::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 }
diff --git a/bitvm/src/bn254/fq6.rs b/bitvm/src/bn254/fq6.rs
new file mode 100644
index 000000000..78b502b94
--- /dev/null
+++ b/bitvm/src/bn254/fq6.rs
@@ -0,0 +1,980 @@
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::utils::Hint;
+use crate::treepp::{script, Script};
+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);
+        }
+        script! {
+            { Fq2::add(a + 4, b + 4) }
+            { Fq2::add(a + 2, b + 4) }
+            { Fq2::add(a, b + 4) }
+        }
+    }
+
+    pub fn sub(a: u32, b: u32) -> Script {
+        if a > b {
+            script! {
+                { Fq2::sub(a + 4, b + 4) }
+                { Fq2::sub(a + 2, b + 4) }
+                { Fq2::sub(a, b + 4) }
+            }
+        } else {
+            script! {
+                { Fq2::sub(a + 4, b + 4) }
+                { Fq2::sub(a + 4, b + 2) }
+                { Fq2::sub(a + 4, b) }
+            }
+        }
+    }
+
+    pub fn double(a: u32) -> Script {
+        script! {
+            { Fq2::double(a + 4) }
+            { Fq2::double(a + 4) }
+            { Fq2::double(a + 4) }
+        }
+    }
+
+    pub fn neg(a: u32) -> Script {
+        script! {
+            { Fq2::neg(a + 4) }
+            { Fq2::neg(a + 4) }
+            { Fq2::neg(a + 4) }
+        }
+    }
+
+    pub fn mul_fq2_by_nonresidue() -> Script {
+        script! {
+            { Fq2::copy(0) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+            { Fq::copy(3) }
+            { Fq::add(2, 0) }
+            { Fq::copy(2) }
+            { Fq::sub(1, 0) }
+            { Fq::add(2, 1) }
+            { Fq::add(2, 0) }
+        }
+    }
+
+    pub fn hinted_square(a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        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);
+
+        let script = script! {
+            // compute s_0 = a_0 ^ 2
+            { Fq2::copy(4) }
+            { hinted_script1 }
+            // 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) }
+            { hinted_script2 }
+            // 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) }
+        };
+
+        hints.extend(hints1);
+        hints.extend(hints2);
+        hints.extend(hints3);
+        hints.extend(hints4);
+        hints.extend(hints5);
+
+        (script, hints)
+    }
+
+    // Input: [A, B]
+    // Output: [C] where C = A x B
+    pub fn hinted_mul(
+        mut a_depth: u32,
+        mut a: ark_bn254::Fq6,
+        mut b_depth: u32,
+        mut b: ark_bn254::Fq6,
+    ) -> (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_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) = 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(a_depth + 4) }
+            { Fq2::copy(b_depth + 6) }
+            { hinted_script1 }
+
+            // compute a+c
+            { 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_depth + 8) }
+            { Fq2::copy(0) }
+            { Fq2::add(4, 0) }
+            { Fq2::sub(4, 2) }
+
+            // compute d+f
+            { 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_depth + 12) }
+            { Fq2::copy(0) }
+            { Fq2::add(4, 0) }
+            { Fq2::sub(4, 2) }
+
+            // compute (a+b+c)(d+e+f) = P(1)
+            { hinted_script2 }
+
+            // compute (a-b+c)(d-e+f) = P(-1)
+            { hinted_script3 }
+
+            // compute 2b
+            { Fq2::roll(a_depth + 8) }
+            { Fq2::double(0) }
+
+            // compute 4c
+            { Fq2::copy(a_depth + 8) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+            // compute a+2b+4c
+            { Fq2::add(2, 0) }
+            { Fq2::roll(a_depth + 10) }
+            { Fq2::add(2, 0) }
+
+            // compute 2e
+            { Fq2::roll(b_depth + 10) }
+            { Fq2::double(0) }
+
+            // compute 4f
+            { Fq2::copy(b_depth + 10) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+
+            // compute d+2e+4f
+            { Fq2::add(2, 0) }
+            { Fq2::roll(b_depth + 12) }
+            { Fq2::add(2, 0) }
+
+            // compute (a+2b+4c)(d+2e+4f) = P(2)
+            { hinted_script4 }
+
+            // compute cf = P(inf)
+            { 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
+
+            // compute 3v_0
+            { Fq2::triple(8) }
+
+            // compute 3v_1
+            { Fq2::triple(8) }
+
+            // compute 6v_4
+            { Fq2::triple(4) }
+            { Fq2::double(0) }
+
+            // compute x = 3v_0 - 3v_1 - v_2 + v_3 - 12v_4
+            { Fq2::copy(4) }
+            { Fq2::copy(4) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(10) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(8) }
+            { Fq2::add(2, 0) }
+            { Fq2::copy(2) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+
+            // compute c_0 = 6v_0 + \beta x
+            { Fq6::mul_fq2_by_nonresidue() }
+            { Fq2::copy(6) }
+            { Fq2::double(0) }
+            { Fq2::add(2, 0) }
+
+            // compute y = -3v_0 + 6v_1 - 2v_2 - v_3 + 12v_4
+            { Fq2::copy(4) }
+            { Fq2::double(0) }
+            { Fq2::copy(8) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(12) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+            { Fq2::roll(10) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(4) }
+            { Fq2::double(0) }
+            { Fq2::add(2, 0) }
+
+            // compute c_1 = y + \beta 6v_4
+            { Fq2::copy(4) }
+            { Fq6::mul_fq2_by_nonresidue() }
+            { Fq2::add(2, 0) }
+
+            // compute c_2 = 3v_1 - 6v_0 + 3v_2 - 6v_4
+            { Fq2::roll(6) }
+            { Fq2::roll(8) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+            { Fq2::roll(8) }
+            { Fq2::triple(0) }
+            { Fq2::add(2, 0) }
+            { Fq2::sub(0, 6) }
+
+            // divide by 6
+            { Fq2::roll(4) }
+            { Fq2::div2() }
+            { Fq2::div3() }
+            { Fq2::roll(4) }
+            { Fq2::div2() }
+            { Fq2::div3() }
+            { 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: [A, B]
+    // Output: [A, B, C] where C = A x B
+    pub fn hinted_mul_keep_elements(
+        mut a_depth: u32,
+        mut a: ark_bn254::Fq6,
+        mut b_depth: u32,
+        mut b: ark_bn254::Fq6,
+    ) -> (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_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) = 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(a_depth + 4) }
+            { Fq2::copy(b_depth + 6) }
+            { hinted_script1 }
+
+            // compute a+c
+            { 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_depth + 8) }
+            { Fq2::copy(0) }
+            { Fq2::add(4, 0) }
+            { Fq2::sub(4, 2) }
+
+            // compute d+f
+            { 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_depth + 12) }
+            { Fq2::copy(0) }
+            { Fq2::add(4, 0) }
+            { Fq2::sub(4, 2) }
+
+            // compute (a+b+c)(d+e+f) = P(1)
+            { hinted_script2 }
+
+            // compute (a-b+c)(d-e+f) = P(-1)
+            { hinted_script3 }
+
+            // compute 2b
+            { Fq2::copy(a_depth + 8) }
+            { Fq2::double(0) }
+
+            // compute 4c
+            { Fq2::copy(a_depth + 8) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+            // compute a+2b+4c
+            { Fq2::add(2, 0) }
+            { Fq2::copy(a_depth + 12) }
+            { Fq2::add(2, 0) }
+
+            // compute 2e
+            { Fq2::copy(b_depth + 10) }
+            { Fq2::double(0) }
+
+            // compute 4f
+            { Fq2::copy(b_depth + 10) }
+            { Fq2::double(0) }
+            { Fq2::double(0) }
+
+            // compute d+2e+4f
+            { Fq2::add(2, 0) }
+            { Fq2::copy(b_depth + 14) }
+            { Fq2::add(2, 0) }
+
+            // compute (a+2b+4c)(d+2e+4f) = P(2)
+            { hinted_script4 }
+
+            // compute cf = P(inf)
+            { Fq2::copy(a_depth + 8) }
+            { Fq2::copy(b_depth + 10) }
+            { hinted_script5 }
+
+            // // at this point, we have v_0, v_1, v_2, v_3, v_4
+
+            // compute 3v_0
+            { Fq2::triple(8) }
+
+            // compute 3v_1
+            { Fq2::triple(8) }
+
+            // compute 6v_4
+            { Fq2::triple(4) }
+            { Fq2::double(0) }
+
+            // compute x = 3v_0 - 3v_1 - v_2 + v_3 - 12v_4
+            { Fq2::copy(4) }
+            { Fq2::copy(4) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(10) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(8) }
+            { Fq2::add(2, 0) }
+            { Fq2::copy(2) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+
+            // compute c_0 = 6v_0 + \beta x
+            { Fq6::mul_fq2_by_nonresidue() }
+            { Fq2::copy(6) }
+            { Fq2::double(0) }
+            { Fq2::add(2, 0) }
+
+            // compute y = -3v_0 + 6v_1 - 2v_2 - v_3 + 12v_4
+            { Fq2::copy(4) }
+            { Fq2::double(0) }
+            { Fq2::copy(8) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(12) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+            { Fq2::roll(10) }
+            { Fq2::sub(2, 0) }
+            { Fq2::copy(4) }
+            { Fq2::double(0) }
+            { Fq2::add(2, 0) }
+
+            // compute c_1 = y + \beta 6v_4
+            { Fq2::copy(4) }
+            { Fq6::mul_fq2_by_nonresidue() }
+            { Fq2::add(2, 0) }
+
+            // compute c_2 = 3v_1 - 6v_0 + 3v_2 - 6v_4
+            { Fq2::roll(6) }
+            { Fq2::roll(8) }
+            { Fq2::double(0) }
+            { Fq2::sub(2, 0) }
+            { Fq2::roll(8) }
+            { Fq2::triple(0) }
+            { Fq2::add(2, 0) }
+            { Fq2::sub(0, 6) }
+
+            // divide by 6
+            { Fq2::roll(4) }
+            { Fq2::div2() }
+            { Fq2::div3() }
+            { Fq2::roll(4) }
+            { Fq2::div2() }
+            { Fq2::div3() }
+            { 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:
+    //    p.c0   (2 elements)
+    //    p.c1   (2 elements)
+    //    p.c2   (2 elements)
+    //    c0  (2 elements)
+    //    c1  (2 elements)
+    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) }
+            { hinted_script1 }
+
+            // compute b_b = p.c1 * c1
+            { Fq2::copy(8) }
+            { Fq2::copy(4) }
+            { hinted_script2 }
+
+            // compute tmp = p.c1 + p.c2
+            { Fq2::copy(10) }
+            { Fq2::copy(10) }
+            { Fq2::add(2, 0) }
+
+            // t1 = c1 * tmp
+            { Fq2::copy(6) }
+            { hinted_script3 }
+
+            // 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(14) }
+            { Fq2::roll(14) }
+            { Fq2::add(2, 0) }
+
+            // t2 = c0 + c1
+            { Fq2::copy(10) }
+            { Fq2::roll(10) }
+            { Fq2::add(2, 0) }
+
+            // t2 = t2 * tmp
+            { hinted_script4 }
+
+            // 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
+            { hinted_script5 }
+
+            // t3 = t3 - a_a
+            { Fq2::sub(0, 8) }
+
+            // t3 = t3 + b_b
+            { Fq2::add(0, 6) }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
+
+        (script, hints)
+    }
+
+    pub fn hinted_mul_by_fp2_constant(
+        a: ark_bn254::Fq6,
+        constant: &ark_bn254::Fq2,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        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);
+
+        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);
+
+        (script, hints)
+    }
+
+    pub fn hinted_frobenius_map(i: usize, a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        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()],
+        );
+
+        let script = script! {
+            { Fq2::roll(4) }
+            { hinted_script1 }
+            { Fq2::roll(4) }
+            { hinted_script2 }
+            { hinted_script3 }
+            { Fq2::roll(4) }
+            { hinted_script4 }
+            { hinted_script5 }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
+
+        (script, hints)
+    }
+
+    pub fn check_validity() -> Script {
+        script! {
+            for _ in 0..3 {
+                { Fq2::check_validity() }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::fq6::Fq6;
+    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_fq6_add() {
+        println!("Fq6.add: {} bytes", Fq6::add(6, 0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        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 script = script! {
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { Fq6::add(6, 0) }
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_sub() {
+        println!("Fq6.sub: {} bytes", Fq6::sub(6, 0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        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 script = script! {
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { Fq6::sub(6, 0) }
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+
+            let script = script! {
+                { Fq6::push(b) }
+                { Fq6::push(a) }
+                { Fq6::sub(0, 6) }
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_double() {
+        println!("Fq6.double: {} bytes", Fq6::double(0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq6::rand(&mut prng);
+            let c = a.double();
+
+            let script = script! {
+                { Fq6::push(a) }
+                { Fq6::double(0) }
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for i 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);
+            if i == 0 {
+                println!("Fq6::hinted_mul: {} bytes", hinted_mul.len());
+            }
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { hinted_mul.clone() }
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_hinted_mul_keep_elements() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for i in 0..100 {
+            let a = ark_bn254::Fq6::rand(&mut prng);
+            let b = ark_bn254::Fq6::rand(&mut prng);
+            let c = ark_bn254::Fq6::rand(&mut prng);
+            let d = a.mul(&b);
+            let e = b.mul(&c);
+
+            let (hinted_mul, hints) = Fq6::hinted_mul_keep_elements(12, a, 6, b);
+            if i == 0 {
+                println!("Fq6::hinted_mul(12,6): {} bytes", hinted_mul.len());
+            }
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { Fq6::push(c) }
+                { hinted_mul.clone() }
+                { Fq6::push(d) }
+                { Fq6::equalverify() }
+
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                { Fq6::push(b) }
+                { Fq6::equalverify() }
+                { Fq6::push(a) }
+                { Fq6::equalverify() }
+
+                OP_TRUE
+            };
+            run(script);
+
+            let (hinted_mul, hints) = Fq6::hinted_mul_keep_elements(6, b, 0, c);
+            if i == 0 {
+                println!("Fq6::hinted_mul(12,6): {} bytes", hinted_mul.len());
+            }
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { Fq6::push(c) }
+                { hinted_mul.clone() }
+                { Fq6::push(e) }
+                { Fq6::equalverify() }
+
+                { Fq6::push(c) }
+                { Fq6::equalverify() }
+                { Fq6::push(b) }
+                { Fq6::equalverify() }
+                { Fq6::push(a) }
+                { Fq6::equalverify() }
+
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_hinted_mul_by_01() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        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 (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! {
+                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
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq6_hinted_frobenius_map() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            for i in 0..6 {
+                let a = ark_bn254::Fq6::rand(&mut prng);
+                let b = a.frobenius_map(i);
+
+                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! {
+                    for hint in hints {
+                        { hint.push() }
+                    }
+                    { Fq6::push(a) }
+                    { hinted_frobenius_map.clone() }
+                    { Fq6::push(b) }
+                    { Fq6::equalverify() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+}
diff --git a/src/bn254/fr.rs b/bitvm/src/bn254/fr.rs
similarity index 54%
rename from src/bn254/fr.rs
rename to bitvm/src/bn254/fr.rs
index f51d8c889..2bcfaa33d 100644
--- a/src/bn254/fr.rs
+++ b/bitvm/src/bn254/fr.rs
@@ -1,4 +1,10 @@
+#![allow(clippy::reversed_empty_ranges)]
+use bitcoin_script::script;
+use num_bigint::{BigInt, BigUint};
+use num_traits::Num;
+
 use crate::bn254::fp254impl::Fp254Impl;
+use crate::treepp::Script;
 
 pub struct Fr;
 
@@ -6,20 +12,11 @@ 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,
-    ];
 
     const P_PLUS_ONE_DIV2: &'static str =
         "183227397098d014dc2822db40c0ac2e9419f4243cdcb848a1f0fac9f8000001";
@@ -32,36 +29,32 @@ impl Fp254Impl for Fr {
     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 crate::bn254::fp254impl::Fp254Impl;
     use ark_ff::AdditiveGroup;
-    use ark_ff::{BigInteger, Field, PrimeField};
     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;
 
-    #[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
-        };
-        run(script);
-    }
-
     #[test]
     fn test_add() {
         println!("Fr.add: {} bytes", Fr::add(0, 1).len());
@@ -140,54 +133,6 @@ mod test {
         }
     }
 
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
     #[test]
     fn test_neg() {
         println!("Fr.neg: {} bytes", Fr::neg(0).len());
@@ -209,26 +154,6 @@ mod test {
         }
     }
 
-    #[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
-            };
-            run(script);
-        }
-    }
-
     #[test]
     fn test_div2() {
         println!("Fr.div2: {} bytes", Fr::div2().len());
@@ -272,7 +197,7 @@ mod test {
 
     #[test]
     fn test_is_one() {
-        println!("Fr.is_one: {} bytes", Fr::is_one(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()
@@ -281,12 +206,11 @@ mod test {
             { Fr::push_one() }
             { Fr::is_one_keep_element(0) }
             OP_TOALTSTACK
-            { Fr::is_one(0) }
+            { Fr::is_one() }
             OP_FROMALTSTACK
             OP_BOOLAND
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 
     #[test]
@@ -332,95 +256,4 @@ mod test {
             run(script);
         }
     }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_is_field() {
-        let m = BigUint::from_str_radix(Fr::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        println!("Fr.is_field: {} bytes", Fr::is_field().len());
-
-        for _ in 0..10 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let a = a.rem(&m);
-
-            let script = script! {
-                { Fr::push_u32_le(&a.to_u32_digits()) }
-                { Fr::is_field() }
-            };
-            run(script);
-        }
-
-        let script = script! {
-            { Fr::push_modulus() } OP_1 OP_ADD
-            { Fr::is_field() }
-            OP_NOT
-        };
-        run(script);
-
-        let script = script! {
-            { Fr::push_modulus() } OP_1 OP_SUB
-            OP_NEGATE
-            { Fr::is_field() }
-            OP_NOT
-        };
-        run(script);
-    }
-
-    #[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
-            };
-        run(script);
-        }
-    }
 }
diff --git a/bitvm/src/bn254/g1.rs b/bitvm/src/bn254/g1.rs
new file mode 100644
index 000000000..4c51780dc
--- /dev/null
+++ b/bitvm/src/bn254/g1.rs
@@ -0,0 +1,963 @@
+use super::fq2::Fq2;
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::utils::Hint;
+use crate::treepp::{script, Script};
+use ark_ec::AffineRepr;
+use ark_ff::{AdditiveGroup, Field};
+use num_bigint::BigUint;
+use num_traits::Zero;
+
+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(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 toaltstack() -> Script {
+        script! {
+            {Fq::toaltstack()}
+            {Fq::toaltstack()}
+        }
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            {Fq::fromaltstack()}
+            {Fq::fromaltstack()}
+        }
+    }
+
+    pub fn read_from_stack(witness: Vec<Vec<u8>>) -> ark_bn254::G1Affine {
+        assert_eq!(witness.len() as u32, Fq::N_LIMBS * 2);
+        let x: ark_bn254::Fq =
+            BigUint::from_slice(&Fq::read_u32_le(witness[0..Fq::N_LIMBS as usize].to_vec())).into();
+        let y: ark_bn254::Fq = BigUint::from_slice(&Fq::read_u32_le(
+            witness[Fq::N_LIMBS as usize..2 * Fq::N_LIMBS as usize].to_vec(),
+        ))
+        .into();
+        let is_inf = x.is_zero() && y.is_zero();
+        ark_bn254::G1Affine {
+            x,
+            y,
+            infinity: is_inf,
+        }
+    }
+
+    pub fn hinted_check_add_prevent_degenerate(
+        t: ark_bn254::G1Affine,
+        q: ark_bn254::G1Affine,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = vec![];
+        assert_ne!(t, q);
+        assert_ne!(t, -q);
+
+        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(2) }
+                { 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
+                    }
+                    { Fq::check_validity_and_keep_element() }
+                    for _ in 0..Fq::N_LIMBS {
+                        OP_DEPTH OP_1SUB OP_ROLL
+                    }                                  // qx qy tx ty c3 c4
+                    { Fq::check_validity_and_keep_element() }
+                    { 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)
+    }
+
+    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() {
+            // no hint, dummy zero
+            (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
+        } else if t == -q {
+            // no hint, dummy zero
+            (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
+        } else if t == q {
+            // doubling hints
+            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 {
+            // adding hints
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let bias = t.y - alpha * t.x;
+            (alpha, bias)
+        };
+
+        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 (hinted_script3, hint3) = Self::hinted_check_tangent_line(t, alpha);
+
+        let script = script! {           // tx ty qx qy
+            { G1Affine::is_zero_keep_element() }
+            OP_IF
+                { G1Affine::drop() }
+            OP_ELSE
+                { G1Affine::roll(2) }
+                { G1Affine::is_zero_keep_element() }
+                OP_IF
+                    { G1Affine::drop() }
+                OP_ELSE                                    // qx qy tx ty
+                    { Fq::equal_keep_elements(3, 1) }      // t == q or t == -q
+                    OP_DUP
+                    OP_TOALTSTACK
+                    OP_TOALTSTACK
+                    { Fq::equal_keep_elements(2, 0) }
+                    OP_NOT
+                    OP_FROMALTSTACK
+                    OP_BOOLAND
+                    OP_IF                                  // case: t == -q
+                        OP_FROMALTSTACK OP_DROP
+                        { G1Affine::drop() }
+                        { G1Affine::drop() }
+                        { G1Affine::identity() }
+                    OP_ELSE                                // case: t != -q
+                        for _ in 0..Fq::N_LIMBS {
+                            OP_DEPTH OP_1SUB OP_ROLL
+                        }
+                        { Fq::check_validity_and_keep_element() }
+                        for _ in 0..Fq::N_LIMBS {
+                            OP_DEPTH OP_1SUB OP_ROLL
+                        }                                  // qx qy tx ty c3 c4
+                        { Fq::check_validity_and_keep_element() }
+                        { Fq::copy(1) }                    // qx qy tx ty c3 c4 c3
+                        { Fq::copy(1) }                    // qx qy tx ty c3 c4 c3 c4
+                        { Fq::copy(5) }                    // qx qy tx ty c3 c4 c3 c4 tx
+                        { Fq::roll(5) }                    // qx qy tx c3 c4 c3 c4 tx ty
+                        OP_FROMALTSTACK
+                        OP_IF                              // case: t == q
+                            { hinted_script3 }             // qx qy tx c3 c4 is_tangent_line_correct
+                            OP_VERIFY                      // qx qy tx c3 c4
+                            { Fq::roll(3) }                // qx tx c3 c4 qy
+                            { Fq::drop() }                 // qx tx c3 c4
+                        OP_ELSE                            // case: general case
+                            { Fq::copy(8) }                // qx qy tx c3 c4 c3 c4 tx ty qx
+                            { Fq::roll(8) }                // qx tx c3 c4 c3 c4 tx ty qx qy
+                            { hinted_script1 }             // qx tx c3 c4 0/1
+                            OP_VERIFY                      // qx tx c3 c4
+                        OP_ENDIF
+                        { Fq::roll(2) }                    // qx c3 c4 tx
+                        { Fq::roll(3) }                    // c3 c4 tx qx
+                        { hinted_script2 }                 // x' y'
+                    OP_ENDIF
+                OP_ENDIF
+            OP_ENDIF
+        };
+
+        if t.is_zero() || q.is_zero() {
+            // no hint
+        } else if t == -q {
+            // no hint
+        } else if t == q {
+            hints.push(Hint::Fq(alpha));
+            hints.push(Hint::Fq(-bias));
+            hints.extend(hint3);
+            hints.extend(hint2);
+        } else {
+            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
+                { Fq::check_validity_and_keep_element() }
+                for _ in 0..Fq::N_LIMBS {
+                    OP_DEPTH OP_1SUB OP_ROLL
+                }                                        // x, y, alpha, -bias
+                { Fq::check_validity_and_keep_element() }
+                { 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(y_sq_hint);
+        hints.extend(x_sq_hint);
+        hints.extend(x_cu_hint);
+        let scr = script! {
+            { y_sq }
+            { Fq::copy(1) }
+            { x_sq }
+            { Fq::roll(2) }
+            { x_cu }
+            { Fq::push_hex("3") }
+            { Fq::add(1, 0) }
+            { 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(a: u32) -> Script {
+        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
+///      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) = 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! {
+
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+
+        {hinted_script1}
+        {Fq::push_one()}
+        {Fq::equalverify(1,0)}
+
+        // [hints, yinv, x]
+        {Fq::copy(1)}
+        {Fq::toaltstack()}
+        {Fq::neg(0)}
+        {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) = 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! {
+        // [yinv, hints,.., x, y]
+        {Fq2::toaltstack()}
+        for _ in 0..Fq::N_LIMBS {
+            OP_DEPTH OP_1SUB OP_ROLL
+        }
+        { Fq::check_validity_and_keep_element() }
+        {Fq2::fromaltstack()}
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+
+        {hinted_script1}
+        {Fq::push_one()}
+        {Fq::equalverify(1,0)}
+
+        // [hints, yinv, x]
+        {Fq::copy(1)}
+        {Fq::toaltstack()}
+        {Fq::neg(0)}
+        {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::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::g1::G1Affine;
+
+    use super::*;
+    use crate::{treepp::*, ExecuteInfo};
+    use ark_ec::CurveGroup;
+    use ark_ff::Field;
+    use ark_std::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::G1Affine::identity();
+        let script = script! {
+            {G1Affine::push(b)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_b = G1Affine::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_prevent_degenerate() {
+        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 r = (t + q).into_affine();
+
+        let (hinted_check_add, hints) = G1Affine::hinted_check_add_prevent_degenerate(t, q);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { G1Affine::push(t) }
+            { G1Affine::push(q) }
+            { hinted_check_add.clone() }
+            { G1Affine::push(r) }
+            { G1Affine::equalverify() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_add_prevent_degenerate: {} @ {} stack",
+            hinted_check_add.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_check_add() {
+        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 r = (t + q).into_affine();
+        let tt = (t + t).into_affine();
+        let negt = -t;
+        let z = ark_bn254::G1Affine::zero();
+
+        for (t, q, r) in [(t, q, r), (t, t, tt), (t, negt, z), (t, z, t)] {
+            let (hinted_check_add, hints) = G1Affine::hinted_check_add(t, q);
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { G1Affine::push(t) }
+                { G1Affine::push(q) }
+                { hinted_check_add.clone() }
+                { G1Affine::push(r) }
+                { G1Affine::equalverify() }
+                OP_TRUE
+            };
+            let exec_result = execute_script(script);
+            assert!(exec_result.success);
+            println!(
+                "hinted_check_add: {} @ {} 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);
+    }
+}
diff --git a/bitvm/src/bn254/g2.rs b/bitvm/src/bn254/g2.rs
new file mode 100644
index 000000000..859f5e934
--- /dev/null
+++ b/bitvm/src/bn254/g2.rs
@@ -0,0 +1,1259 @@
+use super::utils::Hint;
+use crate::bn254::ell_coeffs::EllCoeff;
+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::treepp::{script, Script};
+use ark_ec::bn::BnConfig;
+use ark_ff::{AdditiveGroup, Field};
+use num_bigint::BigUint;
+use num_traits::Zero;
+use std::str::FromStr;
+
+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(a: u32) -> Script {
+        script! {
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+        }
+    }
+
+    // [ax, ay, bx, by]
+    pub fn copy(a: u32) -> Script {
+        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(y_sq_hint);
+        hints.extend(x_sq_hint);
+        hints.extend(x_cu_hint);
+
+        let scr = script! {
+            { y_sq }
+            { Fq2::copy(2) }
+            { x_sq }
+            { Fq2::roll(4) }
+            { x_cu }
+            { Fq::push_dec("19485874751759354771024239261021720505790618469301721065564631296452457478373") }
+            { Fq::push_dec("266929791119991161246907387137283842545076965332900288569378510910307636690") }
+            { Fq2::add(2, 0) }
+            { 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(),
+        );
+
+        let is_inf = x.is_zero() && y.is_zero();
+
+        ark_bn254::G2Affine {
+            x,
+            y,
+            infinity: is_inf,
+        }
+    }
+}
+
+// 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
+            }
+            { Fq::check_validity_and_keep_element() }
+        }
+    };
+    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_w4(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 super::*;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::g1::hinted_from_eval_point;
+    use crate::bn254::g2::G2Affine;
+    use crate::{treepp::*, ExecuteInfo};
+    use ark_ff::AdditiveGroup;
+    use ark_std::UniformRand;
+    use num_traits::One;
+    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::G2Affine::rand(&mut prng);
+        let script = script! {
+            {G2Affine::push(a)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_a = G2Affine::read_from_stack(witness);
+
+        assert_eq!(a, recovered_a);
+
+        let b = ark_bn254::G2Affine::identity();
+        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 77%
rename from src/bn254/mod.rs
rename to bitvm/src/bn254/mod.rs
index faf6e96cf..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;
 
@@ -13,4 +13,3 @@ pub mod ell_coeffs;
 pub mod fp254impl;
 pub mod msm;
 pub mod utils;
-pub mod g2_subgroup_check;
diff --git a/bitvm/src/bn254/msm.rs b/bitvm/src/bn254/msm.rs
new file mode 100644
index 000000000..98b7faf9b
--- /dev/null
+++ b/bitvm/src/bn254/msm.rs
@@ -0,0 +1,521 @@
+/// 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::{fr::Fr, g1::G1Affine};
+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: &[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::identity() }
+                } 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).div_ceil(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.div_ceil(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).div_ceil(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, table_index);
+            let (selected_table_vec, selected_table_script) =
+                (tables.0[table_index].clone(), tables.1[table_index].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_prevent_degenerate(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>), usize)> {
+    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;
+        for x in scalar_mul_res {
+            aggregate_result_of_all_scalar_muls.push((x, i));
+        }
+    }
+    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.div_ceil(window);
+            let random_index = u32::rand(&mut prng) % num_tables;
+            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, 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 .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..b7efd18cd
--- /dev/null
+++ b/bitvm/src/bn254/pairing.rs
@@ -0,0 +1,871 @@
+#![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::{AffinePairing, BnAffinePairing, G2Prepared};
+    use crate::bn254::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq12::Fq12;
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::g1::hinted_from_eval_point;
+    use crate::bn254::pairing::Pairing;
+    use crate::groth16::constants::LAMBDA;
+    use crate::{execute_script_without_stack_limit, treepp::*};
+
+    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);
+    }
+}
diff --git a/bitvm/src/bn254/utils.rs b/bitvm/src/bn254/utils.rs
new file mode 100644
index 000000000..07fcff677
--- /dev/null
+++ b/bitvm/src/bn254/utils.rs
@@ -0,0 +1,77 @@
+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),
+    BigIntegerTmulLC2W4(num_bigint::BigInt),
+    BigIntegerTmulLC4(num_bigint::BigInt),
+}
+
+impl Hint {
+    pub fn push(&self) -> Script {
+        const K1: (u32, u32, u32) = Fq::bigint_tmul_lc_1();
+        const K2: (u32, u32, u32) = Fq::bigint_tmul_lc_2();
+        const K3: (u32, u32, u32) = Fq::bigint_tmul_lc_2_w4();
+        const K4: (u32, 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 T3 = BigIntImpl<{ K3.0 }, { K3.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::BigIntegerTmulLC2W4(a) => script! {
+                { T3::push_u32_le(&bigint_to_u32_limbs(a.clone(), T3::N_BITS)) }
+            },
+            Hint::BigIntegerTmulLC4(a) => script! {
+                { T4::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()
+}
diff --git a/bitvm/src/chunk/api.rs b/bitvm/src/chunk/api.rs
new file mode 100644
index 000000000..03efbfe7e
--- /dev/null
+++ b/bitvm/src/chunk/api.rs
@@ -0,0 +1,1433 @@
+use crate::chunk::api_compiletime_utils::{
+    append_bitcom_locking_script_to_partial_scripts, generate_partial_script,
+    generate_segments_using_mock_vk_and_mock_proof, partial_scripts_from_segments,
+};
+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::signatures::{Wots, Wots16, Wots32};
+use crate::treepp::*;
+use ark_bn254::Bn254;
+use ark_ec::bn::Bn;
+use bitcoin::ScriptBuf;
+
+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_HASH: usize = 363;
+pub const VALIDATING_TAPS: usize = 1;
+pub const HASHING_TAPS: usize = NUM_HASH;
+pub const NUM_TAPS: usize = HASHING_TAPS + VALIDATING_TAPS;
+
+pub type PublicInputs = [ark_bn254::Fr; NUM_PUBS];
+
+pub type PublicKeys = (
+    [<Wots32 as Wots>::PublicKey; NUM_PUBS],
+    [<Wots32 as Wots>::PublicKey; NUM_U256],
+    [<Wots16 as Wots>::PublicKey; NUM_HASH],
+);
+
+pub type Signatures = (
+    Box<[<Wots32 as Wots>::Signature; NUM_PUBS]>,
+    Box<[<Wots32 as Wots>::Signature; NUM_U256]>,
+    Box<[<Wots16 as Wots>::Signature; NUM_HASH]>,
+);
+
+pub type Assertions = (
+    [[u8; 32]; NUM_PUBS],
+    [[u8; 32]; NUM_U256],
+    [[u8; BLAKE3_HASH_LENGTH]; NUM_HASH],
+);
+
+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 super::*;
+    use crate::chunk::api::Signatures;
+    use crate::{
+        chunk::api::{NUM_HASH, NUM_PUBS, NUM_U256},
+        execute_script,
+        signatures::GenericWinternitzPublicKey,
+        treepp::Script,
+    };
+    use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+    use bitcoin::hex::FromHex;
+    use bitcoin::Witness;
+
+    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 = Vec::<u8>::from_hex(serialize_data).unwrap();
+            RawProof::deserialize_compressed(&*bytes).unwrap()
+        }
+    }
+
+    #[allow(clippy::needless_range_loop)]
+    pub fn utils_signatures_from_raw_witnesses(raw_wits: &[RawWitness]) -> Signatures {
+        assert_eq!(raw_wits.len(), NUM_PUBS + NUM_U256 + NUM_HASH);
+        let mut asigs = vec![];
+        for i in 0..NUM_PUBS {
+            let a = Wots32::raw_witness_to_signature(&Witness::from_slice(&raw_wits[i]));
+            asigs.push(a);
+        }
+        let mut bsigs = vec![];
+        for i in 0..NUM_U256 {
+            let a = Wots32::raw_witness_to_signature(&Witness::from_slice(&raw_wits[i + NUM_PUBS]));
+            bsigs.push(a);
+        }
+        let mut csigs = vec![];
+        for i in 0..NUM_HASH {
+            let a = Wots16::raw_witness_to_signature(&Witness::from_slice(
+                &raw_wits[i + NUM_PUBS + NUM_U256],
+            ));
+            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> {
+        // 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<wots_hash::Signature> of length NUM_HASH (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(Wots32::signature_to_raw_witness(sig).to_vec());
+        }
+        for sig in bsigs.iter() {
+            raw_wits.push(Wots32::signature_to_raw_witness(sig).to_vec());
+        }
+        for sig in csigs.iter() {
+            raw_wits.push(Wots16::signature_to_raw_witness(sig).to_vec());
+        }
+
+        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<&GenericWinternitzPublicKey>,
+    ) -> PublicKeys {
+        let mut apubs = vec![];
+        let mut bpubs = vec![];
+        let mut cpubs = vec![];
+        for (idx, f) in commits_public_keys.into_iter().enumerate() {
+            if idx < NUM_PUBS {
+                let p: <Wots32 as Wots>::PublicKey = f.clone().try_into().unwrap();
+                apubs.push(p);
+            } else if idx < NUM_PUBS + NUM_U256 {
+                let p: <Wots32 as Wots>::PublicKey = f.clone().try_into().unwrap();
+                bpubs.push(p);
+            } else if idx < NUM_PUBS + NUM_U256 + NUM_HASH {
+                let p: <Wots16 as Wots>::PublicKey = f.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<ScriptBuf> {
+    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: &[ScriptBuf],
+) -> Vec<ScriptBuf> {
+    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");
+    }
+    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<ScriptBuf> = partial_scripts_from_segments(&segments);
+    let partial_scripts: [ScriptBuf; 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: [ScriptBuf; 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)
+}
+
+// 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: &[ScriptBuf; 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_HASH + 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<ScriptBuf> = partial_scripts_from_segments(&segments)
+        .into_iter()
+        .collect();
+    let partial_scripts: [ScriptBuf; 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: [ScriptBuf; 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 crate::chunk::api::generate_signatures_for_any_proof;
+
+    use crate::chunk::api_runtime_utils::{
+        analyze_largest_segments_from_signatures, get_segments_from_assertion,
+    };
+    use crate::chunk::wrap_hasher::BLAKE3_HASH_LENGTH;
+    use ark_bn254::Bn254;
+    use ark_ff::UniformRand;
+    use ark_serialize::CanonicalDeserialize;
+    use bitcoin::ScriptBuf;
+    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 super::Signatures;
+    use crate::signatures::{Wots, Wots16, Wots32};
+    use crate::{
+        chunk::{
+            api::{
+                api_generate_full_tapscripts, api_generate_partial_script, generate_assertions,
+                generate_signatures, validate_assertions, Assertions,
+            },
+            api::{NUM_HASH, NUM_PUBS, NUM_TAPS, NUM_U256},
+            api_runtime_utils::{
+                get_assertions_from_signature, get_pubkeys, get_signature_from_assertion,
+            },
+        },
+        execute_script,
+    };
+
+    mod test_utils {
+        use crate::chunk::api::Assertions;
+        use crate::chunk::api::NUM_HASH;
+        use crate::chunk::api::NUM_PUBS;
+        use crate::chunk::api::NUM_U256;
+        use crate::chunk::wrap_hasher::BLAKE3_HASH_LENGTH;
+        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(())
+        }
+
+        #[allow(clippy::type_complexity)]
+        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<ScriptBuf>>, 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.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<ScriptBuf>>,
+            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.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<ScriptBuf>> {
+            let mut scr: HashMap<u32, Vec<ScriptBuf>> = HashMap::new();
+            let f = read_map_from_file(file).unwrap();
+            for (k, v) in f {
+                let vs: Vec<ScriptBuf> = v
+                    .into_iter()
+                    .map(|x| {
+                        let bf = ScriptBuf::from_bytes(x);
+                        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();
+        }
+
+        #[allow(clippy::needless_range_loop)]
+        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_HASH {
+                let v: [u8; BLAKE3_HASH_LENGTH] = proof_vec[NUM_PUBS + NUM_U256 + i]
+                    .clone()
+                    .try_into()
+                    .unwrap();
+                assert3.push(v);
+            }
+            let assert3: [[u8; BLAKE3_HASH_LENGTH]; NUM_HASH] = assert3.try_into().unwrap();
+            (assert1, assert2, assert3)
+        }
+    }
+
+    #[test]
+    fn test_largest_chunks() {
+        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_HASH)
+            .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_HASH);
+
+        let proof_asserts = get_assertions_from_signature(proof_sigs);
+        let signed_asserts = get_signature_from_assertion(proof_asserts, secrets);
+        let disprove_scripts: [ScriptBuf; NUM_TAPS] = disprove_scripts.try_into().unwrap();
+
+        let asserts = get_assertions_from_signature(signed_asserts.clone());
+        let (success, segments) = get_segments_from_assertion(asserts, vk.clone());
+        if !success {
+            println!("invalid tapscript at segment {}", segments.len());
+        }
+        analyze_largest_segments_from_signatures(&segments, signed_asserts, &disprove_scripts);
+    }
+
+    #[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_HASH)
+            .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_HASH);
+
+        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: [ScriptBuf; 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 = hint_script
+            .clone()
+            .push_script(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_HASH);
+            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_HASH {
+                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_HASH)
+            .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 = hint_script
+            .clone()
+            .push_script(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");
+    }
+
+    #[allow(clippy::needless_range_loop)]
+    fn sign_assertions(assn: Assertions) -> Signatures {
+        let (ps, fs, hs) = (assn.0, assn.1, assn.2);
+        let secret = MOCK_SECRET;
+
+        let mut psig: Vec<<Wots32 as Wots>::Signature> = vec![];
+        for i in 0..NUM_PUBS {
+            let secret = format!("{secret}{:04x}", i);
+            let psi = Wots32::sign(&Wots16::secret_from_str(&secret), &ps[i]);
+            psig.push(psi);
+        }
+        let psig: Box<[<Wots32 as Wots>::Signature; NUM_PUBS]> = Box::new(psig.try_into().unwrap());
+
+        let mut fsig: Vec<<Wots32 as Wots>::Signature> = vec![];
+        for i in 0..NUM_U256 {
+            let secret = format!("{secret}{:04x}", NUM_PUBS + i);
+            let fsi = Wots32::sign(&Wots16::secret_from_str(&secret), &fs[i]);
+            fsig.push(fsi);
+        }
+        let fsig: Box<[<Wots32 as Wots>::Signature; NUM_U256]> = Box::new(fsig.try_into().unwrap());
+
+        let mut hsig: Vec<<Wots16 as Wots>::Signature> = vec![];
+        for i in 0..NUM_HASH {
+            let secret = format!("{secret}{:04x}", NUM_PUBS + NUM_U256 + i);
+            let hsi = Wots16::sign(&Wots16::secret_from_str(&secret), &hs[i]);
+            hsig.push(hsi);
+        }
+        let hsig: Box<[<Wots16 as Wots>::Signature; NUM_HASH]> = 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, script) in partial_scripts.into_iter().enumerate() {
+            script_cache.insert(i as u32, vec![script]);
+        }
+
+        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_HASH)
+            .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: [ScriptBuf; 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: [ScriptBuf; 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_HASH)
+            .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: [ScriptBuf; NUM_TAPS] = op_scripts.try_into().unwrap();
+
+        let secrets = (0..NUM_PUBS + NUM_U256 + NUM_HASH)
+            .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: [ScriptBuf; NUM_TAPS] = op_scripts.try_into().unwrap();
+
+        let secrets = (0..NUM_PUBS + NUM_U256 + NUM_HASH)
+            .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_HASH);
+            if random.is_some() {
+                index = random.unwrap();
+            }
+            let mut scramble: [u8; 32] = [0u8; 32];
+            scramble[16] = 37;
+            let mut scramble2: [u8; BLAKE3_HASH_LENGTH] = [0u8; BLAKE3_HASH_LENGTH];
+            scramble2[BLAKE3_HASH_LENGTH / 2] = 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_HASH {
+                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_HASH;
+        const RESERVED_SPACE: usize = 16000; // blockreservedweight=8000 + extra (8000)
+        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 = hint_script
+                    .clone()
+                    .push_script(verifier_scripts[index].clone());
+                assert!(scr.len() < 4_000_000 - RESERVED_SPACE);
+                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<ScriptBuf>> = HashMap::new();
+                let disprove_f = &format!("bridge_data/chunker_data/disprove_{index}.json");
+                disprove_map.insert(index as u32, vec![hint_script.compile()]);
+                write_scripts_to_file(disprove_map, disprove_f);
+                assert!(res.success);
+            }
+        }
+    }
+}
diff --git a/bitvm/src/chunk/api_compiletime_utils.rs b/bitvm/src/chunk/api_compiletime_utils.rs
new file mode 100644
index 000000000..b32e4a68e
--- /dev/null
+++ b/bitvm/src/chunk/api_compiletime_utils.rs
@@ -0,0 +1,340 @@
+use std::collections::HashMap;
+use std::str::FromStr;
+
+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_HASH, NUM_PUBS, NUM_TAPS, NUM_U256, VALIDATING_TAPS};
+use crate::chunk::elements::ElementType;
+use crate::treepp;
+use ark_bn254::Bn254;
+use ark_ec::bn::BnConfig;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::Field;
+use bitcoin::ScriptBuf;
+use bitcoin_script::script;
+use num_bigint::BigUint;
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::ops::Neg;
+use treepp::Script;
+
+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<ScriptBuf> {
+    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<ScriptBuf> = partial_scripts_from_segments(&segments);
+    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<ScriptBuf>,
+) -> Vec<ScriptBuf> {
+    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.is_empty())
+            .collect();
+    assert_eq!(ops_scripts.len(), bitcom_scripts.len());
+    let res: Vec<ScriptBuf> = ops_scripts
+        .into_iter()
+        .zip(bitcom_scripts)
+        .map(|(op_scr, bit_scr)| {
+            let mut full_script_bytes = bit_scr.compile().to_bytes();
+            full_script_bytes.extend_from_slice(op_scr.as_bytes());
+            ScriptBuf::from_bytes(full_script_bytes)
+        })
+        .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(); NUM_PUBS],
+    };
+
+    // 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,
+    );
+    assert_eq!(
+        segments.len(),
+        NUM_PUBS + NUM_U256 + NUM_HASH + VALIDATING_TAPS
+    );
+    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: &[Segment]) -> Vec<ScriptBuf> {
+    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<ScriptBuf> = 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 seg in segments {
+        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! {
+                    {script!().push_script(op_scr)}
+                    {hash_scr.clone()}
+                }
+                .compile(),
+            );
+        }
+    }
+    op_scripts
+}
+
+pub(crate) fn bitcom_scripts_from_segments(
+    segments: &[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::PHash(*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
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::chunk::api_compiletime_utils::generate_segments_using_mock_vk_and_mock_proof;
+
+    #[test]
+    fn test_generate_segments_using_mock_proof() {
+        let segments = generate_segments_using_mock_vk_and_mock_proof();
+        assert_eq!(
+            segments.len(),
+            super::NUM_PUBS + super::NUM_U256 + super::NUM_HASH + super::VALIDATING_TAPS
+        );
+    }
+}
diff --git a/bitvm/src/chunk/api_runtime_utils.rs b/bitvm/src/chunk/api_runtime_utils.rs
new file mode 100644
index 000000000..f1d50882f
--- /dev/null
+++ b/bitvm/src/chunk/api_runtime_utils.rs
@@ -0,0 +1,865 @@
+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_compiletime_utils::partial_scripts_from_segments;
+use crate::chunk::elements::HashBytes;
+use crate::chunk::g16_runner_core::groth16_generate_segments;
+use crate::chunk::g16_runner_core::InputProof;
+use crate::chunk::g16_runner_core::InputProofRaw;
+use crate::chunk::g16_runner_core::PublicParams;
+use crate::groth16::offchain_checker::compute_c_wi;
+use crate::treepp::Script;
+use ark_bn254::Bn254;
+use ark_ec::bn::Bn;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::Field;
+use bitcoin::ScriptBuf;
+use bitcoin_script::script;
+
+use super::api::{Assertions, PublicKeys, Signatures, NUM_HASH, NUM_PUBS, NUM_TAPS, NUM_U256};
+use super::elements::CompressedStateObject;
+use super::g16_runner_utils::{ScriptType, Segment};
+use super::wrap_hasher::BLAKE3_HASH_LENGTH;
+use crate::signatures::{CompactWots, Wots, Wots16, Wots32};
+use crate::{bn254::utils::Hint, execute_script};
+
+#[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
+enum SigData {
+    Wots16(<Wots16 as Wots>::Signature),
+    Wots32(<Wots32 as Wots>::Signature),
+}
+
+// Segments are collected in the order [PublicInputSegment, ProofInputSegments, IntermediateHashSegments, FinalScriptSegment]
+// mirror of the function get_segments_from_assertion()
+#[allow(clippy::needless_range_loop)]
+pub(crate) fn get_assertion_from_segments(segments: &[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_HASH {
+        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_HASH] =
+        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_HASH],
+) {
+    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_HASH {
+        let nibs = asserts.2[i].to_vec();
+        let cobj = CompressedStateObject::deserialize_from_byte_array(nibs);
+        cobj_hashes.push(cobj);
+    }
+    let cobj_hashes: [CompressedStateObject; NUM_HASH] = cobj_hashes.try_into().unwrap();
+
+    let cobjs: (
+        [CompressedStateObject; NUM_PUBS],
+        [CompressedStateObject; NUM_U256],
+        [CompressedStateObject; NUM_HASH],
+    ) = (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 cobj in state_pubs {
+            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 cobj in state_fqs {
+            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_HASH],
+    ) -> Option<Vec<HashBytes>> {
+        // Intermediates
+        let mut hashes: Vec<HashBytes> = vec![];
+        for cobj in state_hashes {
+            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<<Wots32 as Wots>::Signature> = vec![];
+    for i in 0..NUM_PUBS {
+        let secret = Wots32::secret_from_str(secrets[i].as_str());
+        let psi = Wots32::sign(&secret, &ps[i]);
+        psig.push(psi);
+    }
+    let psig: Box<[<Wots32 as Wots>::Signature; NUM_PUBS]> = Box::new(psig.try_into().unwrap());
+
+    let mut fsig: Vec<<Wots32 as Wots>::Signature> = vec![];
+    for i in 0..fs.len() {
+        let secret = Wots32::secret_from_str(secrets[i + NUM_PUBS].as_str());
+        let fsi = Wots32::sign(&secret, &fs[i]);
+        fsig.push(fsi);
+    }
+    let fsig: Box<[<Wots32 as Wots>::Signature; NUM_U256]> = Box::new(fsig.try_into().unwrap());
+
+    let mut hsig: Vec<<Wots16 as Wots>::Signature> = vec![];
+    for i in 0..hs.len() {
+        let secret = Wots16::secret_from_str(secrets[i + NUM_PUBS + NUM_U256].as_str());
+        let hsi = Wots16::sign(&secret, &hs[i]);
+        hsig.push(hsi);
+    }
+    let hsig: Box<[<Wots16 as Wots>::Signature; NUM_HASH]> = 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 = Wots32::signature_to_message(&signed_asserts.0[i]);
+        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 = Wots32::signature_to_message(&signed_asserts.1[i]);
+        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_HASH {
+        let nibs = Wots16::signature_to_message(&signed_asserts.2[i]);
+        numhashes.push(nibs);
+    }
+
+    let num_hashes: [[u8; BLAKE3_HASH_LENGTH]; NUM_HASH] = numhashes.try_into().unwrap();
+
+    let asst: Assertions = (ks, num_fqs, num_hashes);
+    asst
+}
+
+fn utils_collect_mul_hints_per_segment(segments: &[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: &[Segment],
+    disprove_scripts: &[ScriptBuf; 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 = hint_script
+            .clone()
+            .push_script(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);
+                panic!();
+            }
+            if exec_result.remaining_script != "OP_PUSHNUM_1" && exec_result.remaining_script != ""
+            {
+                println!(
+                    "Script terminated early {:?} {:?}",
+                    exec_result.remaining_script, segments[i].scr_type
+                );
+                panic!();
+            }
+        } 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
+}
+
+/// This is a duplicate of [`utils_execute_chunked_g16`], just to analyze worst case scenarios
+fn utils_analyze_largest_segments(
+    aux_hints: Vec<Vec<Hint>>,
+    bc_hints: Vec<Script>,
+    segments: &[Segment],
+    disprove_scripts: &[ScriptBuf; NUM_TAPS],
+) {
+    let mut max_script_size = 0;
+    let mut max_script_size_index = 0;
+    let mut max_stack_depth = 0;
+    let mut max_stack_depth_index = 0;
+    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 = hint_script
+            .clone()
+            .push_script(disprove_scripts[tap_script_index].clone());
+        let script_size = total_script.len();
+        if script_size > max_script_size {
+            max_script_size = script_size;
+            max_script_size_index = tap_script_index;
+        }
+
+        let exec_result = execute_script(total_script);
+        let stack_depth = exec_result.stats.max_nb_stack_items;
+        if stack_depth > max_stack_depth {
+            max_stack_depth = stack_depth;
+            max_stack_depth_index = tap_script_index;
+        }
+        tap_script_index += 1;
+    }
+
+    println!(
+        "Max script size with the current VK is {} at index {}",
+        max_script_size, max_script_size_index
+    );
+    println!(
+        "(This shouldn't change with the VK) Max stack depth used is {} at index {}",
+        max_stack_depth, max_stack_depth_index
+    );
+}
+
+pub(crate) fn execute_script_from_assertion(
+    segments: &[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: &[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<ScriptBuf> = partial_scripts_from_segments(segments)
+        .into_iter()
+        .collect();
+    let partial_scripts: [ScriptBuf; 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: &[Segment],
+    signed_assts: Signatures,
+    disprove_scripts: &[ScriptBuf; 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: &[Segment],
+        signed_asserts: Signatures,
+    ) -> Vec<Script> {
+        let scalar_sigs: Vec<SigData> = signed_asserts
+            .0
+            .iter()
+            .map(|f| SigData::Wots32(*f))
+            .collect();
+        let felts_sigs: Vec<SigData> = signed_asserts
+            .1
+            .iter()
+            .map(|f| SigData::Wots32(*f))
+            .collect();
+        let hash_sigs: Vec<SigData> = signed_asserts
+            .2
+            .iter()
+            .map(|f| SigData::Wots16(*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::Wots16(signature) => Wots16::compact_signature_to_raw_witness(
+                        &Wots16::signature_to_compact_signature(signature),
+                    ),
+                    SigData::Wots32(signature) => Wots32::compact_signature_to_raw_witness(
+                        &Wots32::signature_to_compact_signature(signature),
+                    ),
+                };
+                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)
+}
+
+/// This is a duplicate of [`execute_script_from_signature`], just to analyze worst case scenarios
+pub fn analyze_largest_segments_from_signatures(
+    segments: &[Segment],
+    signed_assts: Signatures,
+    disprove_scripts: &[ScriptBuf; NUM_TAPS],
+) {
+    // 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: &[Segment],
+        signed_asserts: Signatures,
+    ) -> Vec<Script> {
+        let scalar_sigs: Vec<SigData> = signed_asserts
+            .0
+            .iter()
+            .map(|f| SigData::Wots32(*f))
+            .collect();
+        let felts_sigs: Vec<SigData> = signed_asserts
+            .1
+            .iter()
+            .map(|f| SigData::Wots32(*f))
+            .collect();
+        let hash_sigs: Vec<SigData> = signed_asserts
+            .2
+            .iter()
+            .map(|f| SigData::Wots16(*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::Wots16(signature) => Wots16::compact_signature_to_raw_witness(
+                        &Wots16::signature_to_compact_signature(signature),
+                    ),
+                    SigData::Wots32(signature) => Wots32::compact_signature_to_raw_witness(
+                        &Wots32::signature_to_compact_signature(signature),
+                    ),
+                };
+                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);
+
+    utils_analyze_largest_segments(mul_hints, bc_hints, segments, disprove_scripts);
+}
+
+#[allow(clippy::needless_range_loop)]
+pub(crate) fn get_pubkeys(secret_key: Vec<String>) -> PublicKeys {
+    let mut pubins = vec![];
+    for i in 0..NUM_PUBS {
+        let secret = Wots32::secret_from_str(secret_key[i].as_str());
+        pubins.push(Wots32::generate_public_key(&secret));
+    }
+    let mut fq_arr = vec![];
+    for i in 0..NUM_U256 {
+        let secret = Wots32::secret_from_str(secret_key[i + NUM_PUBS].as_str());
+        let p256 = Wots32::generate_public_key(&secret);
+        fq_arr.push(p256);
+    }
+    let mut h_arr = vec![];
+    for i in 0..NUM_HASH {
+        let secret = Wots16::secret_from_str(secret_key[i + NUM_PUBS + NUM_U256].as_str());
+        let phash = Wots16::generate_public_key(&secret);
+        h_arr.push(phash);
+    }
+    let wotspubkey: PublicKeys = (
+        pubins.try_into().unwrap(),
+        fq_arr.try_into().unwrap(),
+        h_arr.try_into().unwrap(),
+    );
+    wotspubkey
+}
+
+#[cfg(test)]
+mod test {
+    use crate::chunk::api_compiletime_utils::append_bitcom_locking_script_to_partial_scripts;
+    use ark_serialize::CanonicalDeserialize;
+    use bitcoin::ScriptBuf;
+
+    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_HASH)
+            .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_HASH)
+            .map(|idx| format!("{MOCK_SECRET}{:04x}", idx))
+            .collect::<Vec<String>>();
+        let pubkeys = get_pubkeys(secrets);
+        println!("execute_script_from_signature");
+        let partial_scripts: Vec<ScriptBuf> = partial_scripts_from_segments(&segments);
+        let disprove_scripts =
+            append_bitcom_locking_script_to_partial_scripts(pubkeys, partial_scripts.to_vec());
+        let disprove_scripts: [ScriptBuf; 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");
+    }
+}
diff --git a/bitvm/src/chunk/elements.rs b/bitvm/src/chunk/elements.rs
new file mode 100644
index 000000000..a64ace820
--- /dev/null
+++ b/bitvm/src/chunk/elements.rs
@@ -0,0 +1,417 @@
+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)]
+#[allow(clippy::enum_variant_names)]
+#[allow(clippy::large_enum_variant)]
+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()
+    #[allow(clippy::wrong_self_convention)]
+    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
+    #[allow(clippy::wrong_self_convention)]
+    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 crate::{
+        bn254::{fp254impl::Fp254Impl, fq::Fq},
+        chunk::{elements::ElementType, wrap_hasher::hash_messages},
+        execute_script,
+    };
+    use ark_ff::UniformRand;
+    use bitcoin_script::script;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    #[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);
+    }
+}
diff --git a/bitvm/src/chunk/g16_runner_core.rs b/bitvm/src/chunk/g16_runner_core.rs
new file mode 100644
index 000000000..bd03c478c
--- /dev/null
+++ b/bitvm/src/chunk/g16_runner_core.rs
@@ -0,0 +1,1156 @@
+use crate::chunk::{
+    elements::CompressedStateObject, g16_runner_utils::*, taps_point_ops::frob_q_power,
+};
+use ark_ec::CurveGroup;
+use ark_ff::{Field, PrimeField};
+use bitcoin::ScriptBuf;
+
+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);
+
+    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);
+
+    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()
+}
+
+#[allow(clippy::type_complexity)]
+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: ScriptBuf::new(),
+        })
+        .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: ScriptBuf::new(),
+    })
+    .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: ScriptBuf::new(),
+        })
+        .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: ScriptBuf::new(),
+    })
+    .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 crate::bn254::ell_coeffs::AffinePairing;
+    use ark_bn254::Bn254;
+    use ark_ec::{bn::BnConfig, AffineRepr, CurveGroup};
+    use ark_ff::{AdditiveGroup, Field};
+    use ark_serialize::CanonicalDeserialize;
+    use bitcoin_script::script;
+    use num_bigint::BigUint;
+    use std::{ops::Neg, str::FromStr};
+
+    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);
+        }
+
+        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_ext_miller::chunk_frob_fp12,
+            taps_mul::{chunk_dense_dense_mul, chunk_fq12_square},
+            taps_point_ops::{
+                chunk_init_t4, chunk_point_ops_and_multiply_line_evals_step_2, frob_q_power,
+            },
+        };
+
+        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;
+        #[allow(unused_assignments)] // clippy bug?
+        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);
+        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);
+    }
+}
diff --git a/bitvm/src/chunk/g16_runner_utils.rs b/bitvm/src/chunk/g16_runner_utils.rs
new file mode 100644
index 000000000..b07998064
--- /dev/null
+++ b/bitvm/src/chunk/g16_runner_utils.rs
@@ -0,0 +1,539 @@
+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::Field;
+use bitcoin::ScriptBuf;
+use bitcoin_script::script;
+
+use super::taps_ext_miller::{chunk_final_verify, chunk_frob_fp12, chunk_hash_c, chunk_hash_c_inv};
+
+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: ScriptBuf,
+    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: scr.compile(),
+    }
+}
+
+// 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: scr.compile(),
+    }
+}
+
+// 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: scr.compile(),
+    }
+}
+
+// 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: scr.compile(),
+    }
+}
+
+// ops
+#[allow(clippy::too_many_arguments)]
+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: scr.compile(),
+    }
+}
+
+// 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: scr.compile(),
+    }
+}
+
+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 * BATCH_SIZE_PER_CHUNK - 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![];
+    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));
+
+            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: scr.compile(),
+            });
+        }
+    } 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: ScriptBuf::new(),
+            });
+        }
+    }
+    segments
+}
+
+pub(crate) fn wrap_hint_hash_p(
+    skip: bool,
+    segment_id: usize,
+    in_t: &Segment,
+    pub_vky0: ark_bn254::G1Affine,
+) -> Segment {
+    let input_segment_info = vec![(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: scr.compile(),
+    }
+}
+
+pub(crate) fn wrap_hints_precompute_p(
+    skip: bool,
+    segment_id: usize,
+    in_py: &Segment,
+    in_px: &Segment,
+) -> Segment {
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_py.id, ElementType::FieldElem),
+        (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: scr.compile(),
+    }
+}
+
+pub(crate) fn wrap_hints_precompute_p_from_hash(
+    skip: bool,
+    segment_id: usize,
+    in_p: &Segment,
+) -> Segment {
+    let input_segment_info = vec![(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: scr.compile(),
+    }
+}
+
+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: scr.compile(),
+    }
+}
+
+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: scr.compile(),
+    }
+}
+
+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: scr.compile(),
+    }
+}
diff --git a/bitvm/src/chunk/helpers.rs b/bitvm/src/chunk/helpers.rs
new file mode 100644
index 000000000..4b7a41af9
--- /dev/null
+++ b/bitvm/src/chunk/helpers.rs
@@ -0,0 +1,251 @@
+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::bn254::fq::Fq;
+    use crate::{
+        chunk::wrap_hasher::hash_utils::{hash_fp14, hash_fp2, hash_fp4, hash_fp6},
+        execute_script,
+    };
+
+    #[test]
+    #[allow(clippy::needless_range_loop)]
+    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]
+    #[allow(clippy::needless_range_loop)]
+    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..121161bc6
--- /dev/null
+++ b/bitvm/src/chunk/mod.rs
@@ -0,0 +1,17 @@
+mod wrap_hasher;
+mod wrap_wots;
+
+mod elements;
+mod helpers;
+
+pub mod api;
+pub mod api_compiletime_utils;
+mod api_runtime_utils;
+
+pub mod g16_runner_core;
+pub mod g16_runner_utils;
+
+mod taps_ext_miller;
+mod taps_msm;
+mod taps_mul;
+mod taps_point_ops;
diff --git a/bitvm/src/chunk/taps_ext_miller.rs b/bitvm/src/chunk/taps_ext_miller.rs
new file mode 100644
index 000000000..b24deeda2
--- /dev/null
+++ b/bitvm/src/chunk/taps_ext_miller.rs
@@ -0,0 +1,826 @@
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::fq6::Fq6;
+use crate::bn254::g1::{hinted_from_eval_points, G1Affine};
+use crate::bn254::g2::{hinted_mul_by_char_on_phi_sq_q, G2Affine};
+use crate::bn254::utils::*;
+use crate::chunk::elements::ElementType;
+use crate::chunk::wrap_hasher::hash_messages;
+use crate::{
+    bn254::{fp254impl::Fp254Impl, fq::Fq},
+    treepp::*,
+};
+use ark_ff::{AdditiveGroup, Field, PrimeField};
+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::is_valid() }
+        OP_TOALTSTACK
+        { Fq::is_valid() }
+        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]
+
+        // Validity checks
+        { Fq::check_validity() }
+        { Fq::check_validity() }
+        { Fq::fromaltstack() } { Fq::fromaltstack() }
+
+        // [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]
+
+        // Validity checks
+        { Fq6::check_validity() }
+        { Fq6::fromaltstack() }
+
+        {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::is_valid() }
+            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::is_valid() }
+            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]
+
+        // Validity checks: f is Fq6, t4 is G2Affine, ht4_le is a hash and q4 is G2Affine
+        { G2Affine::fromaltstack() }
+        { Fq2::toaltstack() } { Fq2::toaltstack() } // q4 doesn't need a validity check
+        { Fq::toaltstack() } //ht4_le
+        { Fq2::check_validity() } { Fq2::check_validity() } //t4
+        { Fq6::check_validity() } { Fq6::fromaltstack() } //f, moved back to the top of the stack
+
+        // [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::elements::{CompressedStateObject, DataType, ElemG2Eval, ElementType};
+    use crate::chunk::helpers::extern_hash_nibbles;
+    use crate::chunk::taps_ext_miller::{chunk_final_verify, chunk_hash_c};
+    use crate::chunk::taps_point_ops::frob_q_power;
+    use crate::chunk::wrap_hasher::hash_messages;
+
+    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..6fe979ec2
--- /dev/null
+++ b/bitvm/src/chunk/taps_msm.rs
@@ -0,0 +1,544 @@
+use crate::bn254::fq::Fq;
+use crate::bn254::fr::Fr;
+use crate::bn254::g1::G1Affine;
+use crate::bn254::msm;
+use crate::bn254::utils::Hint;
+use crate::chunk::api::NUM_PUBS;
+use crate::{bn254::fp254impl::Fp254Impl, treepp::*};
+use ark_ec::CurveGroup;
+use ark_ff::{AdditiveGroup, Field, PrimeField};
+
+use super::elements::ElementType;
+use super::wrap_hasher::hash_messages;
+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 ks = input_ks
+        .iter()
+        .map(|x| {
+            if *x < ark_bn254::Fr::MODULUS {
+                *x
+            } else {
+                ark_ff::BigInt::<4>::from(1u64)
+            }
+        })
+        .collect::<Vec<ark_ff::BigInt<4>>>();
+
+    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, variable_index)) 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::is_valid() }
+
+                // [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]
+
+                // Validity checks for G1Acc
+                { Fq::check_validity() } { Fq::check_validity() }
+                { G1Affine::fromaltstack() }
+
+                {Fr::fromaltstack()}
+
+                {Fr::copy(0)}
+                { Fr::is_valid() }
+
+                // [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]
+                    {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 input_ks[*variable_index] < ark_bn254::Fr::MODULUS {
+            chunk_scripts.push((chunk.0, true, sc, chunk.2.clone()));
+        } else {
+            chunk_scripts.push((chunk.0, false, 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_prevent_degenerate(t, q);
+    let r = (t + q).into_affine();
+    let ops_script = script! {
+        // [t] [hash_r, hash_t]
+
+        //Validity checks
+        { Fq2::check_validity() } { Fq2::fromaltstack() }
+
+        { 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 super::*;
+    use crate::{
+        bn254::{fq::Fq, fq2::Fq2, msm::dfs_with_constant_mul},
+        chunk::{
+            elements::{CompressedStateObject, DataType},
+            helpers::extern_hash_nibbles,
+        },
+    };
+    use ark_ec::AffineRepr;
+    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);
+        }
+    }
+}
diff --git a/bitvm/src/chunk/taps_mul.rs b/bitvm/src/chunk/taps_mul.rs
new file mode 100644
index 000000000..10d20bac1
--- /dev/null
+++ b/bitvm/src/chunk/taps_mul.rs
@@ -0,0 +1,932 @@
+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::{AdditiveGroup, Field};
+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_w4(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_w4(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![];
+
+    // 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) = {
+        let c = (a + a) / denom;
+        let res = Fq6::hinted_mul(6, denom, 0, c);
+        hints.extend_from_slice(&res.1);
+        (res.0, c)
+    };
+
+    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::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}
+        // [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]
+        { Fq6::check_validity() }
+        { Fq6::check_validity() }
+        { Fq6::fromaltstack() }
+        { Fq6::fromaltstack() }
+        {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]
+        { Fq6::check_validity() }
+        { Fq6::check_validity() }
+        { Fq6::check_validity() }
+        { Fq6::fromaltstack() }
+        { Fq6::fromaltstack() }
+        { Fq6::fromaltstack() }
+        {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::{
+            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,
+            },
+            wrap_hasher::hash_messages,
+        },
+        execute_script,
+    };
+
+    #[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..5eff2a3a3
--- /dev/null
+++ b/bitvm/src/chunk/taps_point_ops.rs
@@ -0,0 +1,1860 @@
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::fq6::Fq6;
+use crate::bn254::g1::G1Affine;
+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::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::elements::{ElemG2Eval, ElementType};
+use super::helpers::extern_nibbles_to_limbs;
+use super::taps_mul::utils_multiply_by_line_eval;
+use super::wrap_hasher::hash_messages;
+
+// [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
+            { Fq2::check_validity_and_keep_element() }
+            for _ in 0..Fq::N_LIMBS * 2 {
+                OP_DEPTH OP_1SUB OP_ROLL
+            }
+            { Fq2::check_validity_and_keep_element() }
+            // [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(4) }
+            { G2Affine::is_zero_keep_element() }
+            OP_IF // t == 0
+                // [q, t]
+                {G2Affine::roll(4)}
+                {drop_and_insert_zero.clone()}
+            OP_ELSE
+                // qx qy tx ty
+                {G2Affine::copy(4)}
+                // qx qy tx ty qx qy
+                { Fq2::neg(0)}
+                // qx qy tx ty qx -qy
+                {G2Affine::copy(4)}
+                // 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(4)}
+                    // [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
+                    }
+                    { Fq2::check_validity_and_keep_element() }
+                    for _ in 0..Fq::N_LIMBS * 2 {
+                        OP_DEPTH OP_1SUB OP_ROLL
+                    }
+                    { Fq2::check_validity_and_keep_element() }
+                    // [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)
+}
+
+#[allow(clippy::too_many_arguments)]
+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::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)
+}
+
+#[allow(clippy::too_many_arguments)]
+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]
+
+        // Validity checks: t4 is G2Affine, q4 only exists if !is_dbl and is G2Affine, p4, p3 and p2 are G1Affine.
+        { Fq::check_validity() } { Fq::check_validity() } //p2
+        { Fq::check_validity() } { Fq::check_validity() } //p3
+        { Fq::check_validity() } { Fq::check_validity() } //p4
+        if !is_dbl {
+            { Fq2::check_validity() } { Fq2::check_validity() } //p4
+        }
+        { Fq2::check_validity() } { Fq2::check_validity() } //t4
+
+        { G2Affine::fromaltstack() } //t4
+        if !is_dbl {
+           { G2Affine::fromaltstack() } //p4
+        }
+        { G1Affine::fromaltstack() } //p4
+        { G1Affine::fromaltstack() } //p3
+
+        // [hints, t4, (q4), p4, p3] [p2]
+        {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]
+
+        // Validity checks: {apb, Ab, c} is part of G2EvalMul, apb is two Fq2's, Ab is a Fq6, c is two Fq2's, h is Fq6
+        { Fq6::check_validity() } //h
+        { Fq2::check_validity() } { Fq2::check_validity() } //c
+        { Fq6::check_validity() } //Ab
+        { Fq2::check_validity() } { Fq2::check_validity() } //apb
+
+        { Fq2::fromaltstack() } { Fq2::fromaltstack() }
+        { Fq6::fromaltstack() }
+        { Fq2::fromaltstack() } { Fq2::fromaltstack() }
+        { Fq6::fromaltstack() }
+
+        // [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::is_valid() }
+            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 crate::{
+        bn254::{
+            fp254impl::Fp254Impl, fq::Fq, fq2::Fq2, fq6::Fq6, g1::G1Affine, g2::G2Affine,
+            utils::Hint,
+        },
+        chunk::{
+            elements::{DataType, ElemG2Eval, ElementType},
+            taps_point_ops::{
+                chunk_init_t4, chunk_point_ops_and_multiply_line_evals_step_1,
+                chunk_point_ops_and_multiply_line_evals_step_2,
+                point_ops_and_multiply_line_evals_step_1, point_ops_and_multiply_line_evals_step_2,
+                utils_point_add_eval,
+            },
+            wrap_hasher::hash_messages,
+        },
+        execute_script,
+    };
+    use ark_ec::AffineRepr;
+    use ark_ff::{AdditiveGroup, BigInt, Field, UniformRand};
+    use bitcoin_script::script;
+    use num_bigint::BigUint;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    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()}
+            }
+            { Fq2::toaltstack() }
+            {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()}
+            }
+            { Fq2::toaltstack() }
+            {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);
+    }
+}
diff --git a/bitvm/src/chunk/wrap_hasher.rs b/bitvm/src/chunk/wrap_hasher.rs
new file mode 100644
index 000000000..3e6c5b5ab
--- /dev/null
+++ b/bitvm/src/chunk/wrap_hasher.rs
@@ -0,0 +1,281 @@
+use super::elements::ElementType;
+use crate::{
+    bn254::{fp254impl::Fp254Impl, fq::Fq},
+    hash::blake3::blake3_compute_script,
+    treepp::*,
+};
+use hash_utils::{
+    hash_fp2, hash_fp6, hash_g2acc, hash_g2acc_with_hash_t, hash_g2acc_with_hashed_le,
+};
+
+/// Number of bits that are used for WOTS signing.
+///
+/// The remaining bits are technically malleable,
+/// although collisions should be hard to find,
+/// as long as the number of malleable bits stays low.
+///
+/// Currently, 4 out of 20 bits are malleable.
+pub const BLAKE3_HASH_LENGTH: usize = 16;
+
+/// 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: usize>() -> Script {
+    wrap_scr(blake3_compute_script(N))
+}
+
+// helpers to directly hash data structures that we work with
+// example: extension field elements, point accumulators
+pub(crate) mod hash_utils {
+    use std::sync::LazyLock;
+
+    use crate::{
+        bn254::{fp254impl::Fp254Impl, fq::Fq, fq2::Fq2},
+        chunk::{helpers::pack_nibbles_to_limbs, wrap_hasher::hash_n_bytes},
+        treepp::Script,
+    };
+    use bitcoin_script::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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            script! {
+                // [a00, a01]
+                { hash_n_bytes::<64>() }
+                // Hash(a00|a01)
+                { pack_nibbles_to_limbs() }
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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() }
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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()}
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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()}
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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) ]
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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) ]
+            }
+        });
+        SCRIPT.clone()
+    }
+
+    /// 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 {
+        static SCRIPT: LazyLock<Script> = LazyLock::new(|| {
+            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) ]
+            }
+        });
+        SCRIPT.clone()
+    }
+}
+
+/// 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
+}
diff --git a/bitvm/src/chunk/wrap_wots.rs b/bitvm/src/chunk/wrap_wots.rs
new file mode 100644
index 000000000..c8d5f3401
--- /dev/null
+++ b/bitvm/src/chunk/wrap_wots.rs
@@ -0,0 +1,181 @@
+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::signatures::{CompactWots, Wots, Wots16, Wots32};
+use crate::treepp::Script;
+
+pub(crate) fn checksig_verify_to_limbs(pub_key: &WOTSPubKey) -> Script {
+    match pub_key {
+        WOTSPubKey::PHash(pb) => {
+            let sc_nib = Wots16::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 = Wots32::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()}
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
+pub enum WOTSPubKey {
+    PHash(<Wots16 as Wots>::PublicKey),
+    P256(<Wots32 as Wots>::PublicKey),
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{
+        bn254::{fp254impl::Fp254Impl, fq::Fq},
+        chunk::{
+            elements::CompressedStateObject,
+            helpers::extern_hash_fps,
+            wrap_wots::{checksig_verify_to_limbs, WOTSPubKey},
+        },
+        execute_script,
+    };
+    use ark_ff::{Field, UniformRand};
+    use bitcoin::hex::FromHex;
+    use bitcoin_script::script;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    #[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: [u8; 32] = a
+            .clone()
+            .serialize_to_byte_array()
+            .try_into()
+            .expect("should be 32 bytes");
+
+        let secret =
+            Vec::from_hex("a138982ce17ac813d505a5b40b665d404e9528e7").expect("should be valid hex");
+        let signature = Wots32::sign(&secret, &a_bytes);
+
+        let msg_bytes = Wots32::signature_to_message(&signature);
+        assert_eq!(msg_bytes, a_bytes);
+        let msg = CompressedStateObject::deserialize_from_byte_array(msg_bytes.to_vec());
+        assert_eq!(a, msg);
+
+        let compact_signature_witness = Wots32::compact_sign_to_raw_witness(&secret, &a_bytes);
+        let pub_key = WOTSPubKey::P256(Wots32::generate_public_key(&secret));
+        let scr = script! {
+            {compact_signature_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_wots_hash_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: [u8; 16] = a
+            .clone()
+            .serialize_to_byte_array()
+            .try_into()
+            .expect("should be 16 bytes");
+
+        let secret =
+            Vec::from_hex("a138982ce17ac813d505a5b40b665d404e9528e7").expect("should be valid hex");
+
+        let signature = Wots16::sign(&secret, &a_bytes);
+        let msg_bytes = Wots16::signature_to_message(&signature);
+        assert_eq!(msg_bytes, a_bytes);
+        let msg = CompressedStateObject::deserialize_from_byte_array(msg_bytes.to_vec());
+        assert_eq!(a, msg);
+
+        let compact_signature_witness = Wots16::compact_sign_to_raw_witness(&secret, &a_bytes);
+        let pub_key = WOTSPubKey::PHash(Wots16::generate_public_key(&secret));
+        let scr = script! {
+            {compact_signature_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_witness_signature_conversions() {
+        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: [u8; 16] = a
+            .clone()
+            .serialize_to_byte_array()
+            .try_into()
+            .expect("should be 16 bytes");
+        let secret =
+            Vec::from_hex("a138982ce17ac813d505a5b40b665d404e9528e7").expect("should be valid hex");
+        {
+            let signature = Wots16::sign(&secret, &a_bytes);
+            assert!(
+                signature
+                    == Wots16::raw_witness_to_signature(&Wots16::signature_to_raw_witness(
+                        &signature
+                    ))
+            );
+        }
+        {
+            let signature = Wots16::compact_sign(&secret, &a_bytes);
+            assert!(
+                signature
+                    == Wots16::compact_raw_witness_to_signature(
+                        &Wots16::compact_signature_to_raw_witness(&signature)
+                    )
+            );
+        }
+    }
+}
diff --git a/bitvm/src/groth16/constants.rs b/bitvm/src/groth16/constants.rs
new file mode 100644
index 000000000..6b2cdaa59
--- /dev/null
+++ b/bitvm/src/groth16/constants.rs
@@ -0,0 +1,63 @@
+use ark_ff::{Field, UniformRand};
+use num_bigint::BigUint;
+use num_traits::Num;
+use rand::SeedableRng;
+use rand_chacha::ChaCha20Rng;
+use std::str::FromStr;
+use std::sync::LazyLock;
+
+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 MM_INV: LazyLock<BigUint> = LazyLock::new(|| MM.modinv(&(&*R * &*H)).unwrap());
+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 98%
rename from src/groth16/mod.rs
rename to bitvm/src/groth16/mod.rs
index 6544cd563..2a01c03ed 100644
--- a/src/groth16/mod.rs
+++ b/bitvm/src/groth16/mod.rs
@@ -1,7 +1,6 @@
 pub mod constants;
 pub mod offchain_checker;
 
-
 #[cfg(test)]
 mod test;
 pub mod verifier;
diff --git a/bitvm/src/groth16/offchain_checker.rs b/bitvm/src/groth16/offchain_checker.rs
new file mode 100644
index 000000000..29939a408
--- /dev/null
+++ b/bitvm/src/groth16/offchain_checker.rs
@@ -0,0 +1,128 @@
+#![allow(non_snake_case)]
+use crate::groth16::constants::{COFACTOR_CUBIC, H, K, LAMBDA, MM_INV, R, S, T, W};
+use ark_ff::Field;
+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);
+
+    // 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 {
+        let delta = s - i - 1;
+        let d = 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();
+    let f2 = f1.pow(r_inv.to_u64_digits());
+
+    // m'-th root of f, say f3
+    let f3 = f2.pow(MM_INV.to_u64_digits());
+    log_assert_eq!(
+        f3.pow(&*COFACTOR_CUBIC.to_u64_digits()),
+        ark_bn254::Fq12::ONE
+    );
+
+    // d-th (cubic) root, say c
+    let c = tonelli_shanks_cubic(f3, w, S, T.clone(), K.clone());
+    log_assert_eq!(c.pow(LAMBDA.to_u64_digits()), f * wi);
+
+    (c, wi)
+}
diff --git a/bitvm/src/groth16/test.rs b/bitvm/src/groth16/test.rs
new file mode 100644
index 000000000..a7b851faf
--- /dev/null
+++ b/bitvm/src/groth16/test.rs
@@ -0,0 +1,133 @@
+use crate::execute_script_without_stack_limit;
+use crate::groth16::verifier::Verifier;
+use ark_bn254::Bn254;
+use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
+use ark_ec::pairing::Pairing;
+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, Clone)]
+struct DummyCircuit<F: PrimeField> {
+    pub a: Option<F>,
+    pub b: Option<F>,
+    pub num_variables: usize,
+    pub num_constraints: usize,
+}
+
+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(())
+    }
+}
+
+#[test]
+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());
+    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 (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 = script! {
+        for hint in hints {
+            { hint.push() }
+        }
+        { hinted_groth16_verifier }
+    };
+    end_timer!(start);
+
+    println!("groth16::test_hinted_verify_proof = {} 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);
+}
+
+#[test]
+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::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,
+    };
+    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 (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 = script! {
+        for hint in hints {
+            { hint.push() }
+        }
+        { hinted_groth16_verifier }
+    };
+    end_timer!(start);
+
+    println!("groth16::test_hinted_verify_proof = {} 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/bitvm/src/groth16/verifier.rs b/bitvm/src/groth16/verifier.rs
new file mode 100644
index 000000000..935abbc89
--- /dev/null
+++ b/bitvm/src/groth16/verifier.rs
@@ -0,0 +1,161 @@
+use crate::bn254::ell_coeffs::{AffinePairing, BnAffinePairing, G2Prepared};
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::g1::hinted_from_eval_point;
+use crate::bn254::msm::hinted_msm_with_constant_bases_affine;
+use crate::bn254::pairing::Pairing;
+use crate::bn254::utils::Hint;
+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_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/bitvm/src/hash/blake3.rs b/bitvm/src/hash/blake3.rs
new file mode 100644
index 000000000..3a5e2fcbe
--- /dev/null
+++ b/bitvm/src/hash/blake3.rs
@@ -0,0 +1,646 @@
+use std::collections::HashMap;
+
+use bitcoin::hex::FromHex;
+use bitcoin_script_stack::stack::StackTracker;
+use itertools::Itertools;
+
+pub use bitcoin_script::builder::StructuredScript as Script;
+pub use bitcoin_script::script;
+
+use crate::bigint::U256;
+use crate::hash::blake3_utils::{compress, get_flags_for_block, TablesVars};
+
+/// Internal BLAKE3 implementation.
+///
+/// Set `define_var` to `false` if the message on the stack is already defined as [`StackTracker`] variables.
+///
+/// Set `use_full_tables` to `false` to use half tables instead of full tables.
+///
+/// ## See
+///
+/// [`blake3_compute_script_with_limb`].
+fn blake3(
+    stack: &mut StackTracker,
+    mut msg_len: u32,
+    define_var: bool,
+    use_full_tables: bool,
+    limb_len: u8,
+) {
+    // 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_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"
+    );
+    assert!(
+        (4..32).contains(&limb_len),
+        "limb length must be in the range [4, 32)"
+    );
+
+    //number of msg blocks
+    let num_blocks = msg_len.div_ceil(64);
+
+    // If the compact form of message is on stack but not associated with variable, convert it to StackVariable
+    if define_var {
+        let limb_count = 256u32.div_ceil(limb_len as u32);
+        for i in (0..num_blocks).rev() {
+            stack.define(limb_count, &format!("msg{}p0", i));
+            stack.define(limb_count, &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();
+    }
+
+    stack.custom(
+        script!(
+            OP_DEPTH
+            { 0 } OP_EQUALVERIFY
+        ),
+        0,
+        false,
+        0,
+        "ensure that the stack is actually empty",
+    );
+
+    //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::verify_bigint_on_stack_with_limb_size(limb_len as u32)}
+                {U256::transform_limbsize(limb_len as u32, 4)}
+                for _ in 0..64{
+                    OP_TOALTSTACK
+                }
+            ),
+            1,
+            false,
+            0,
+            &format!("unpack msg{}p1", i),
+        );
+
+        stack.custom(
+            script!(
+                {U256::verify_bigint_on_stack_with_limb_size(limb_len as u32)}
+                {U256::transform_limbsize(limb_len as u32, 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 {
+                        OP_2DROP
+                    }
+
+                    for _ in 0..(j*2) {
+                        OP_TOALTSTACK
+                    }
+
+                    for _ in 0..(4-j) {
+                        OP_2DROP
+                    }
+
+                    for j in 0..(4-j) * 2 {
+                        if j <= 1 {
+                            OP_0
+                        } else if j % 2 == 1 {
+                            OP_2DUP
+                        } // no else since loop is even
+                    }
+
+                    for _ in 0..(j*2){
+                        OP_FROMALTSTACK
+                    }
+
+                    for j in 0..(pad_bytes*2) {
+                        if j <= 1 {
+                            OP_0
+                        } else if j % 2 == 1 {
+                            OP_2DUP
+                        } // no else since loop is even
+                    }
+                ),
+                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_u32 * 8, "blake3-hash");
+}
+
+/// Transforms the given message into a format that BLAKE3 understands.
+fn chunk_message(message_bytes: &[u8]) -> Vec<[u8; 64]> {
+    let len = message_bytes.len();
+    let needed_padding_bytes = if len % 64 == 0 { 0 } else { 64 - (len % 64) };
+
+    message_bytes
+        .iter()
+        .copied()
+        .chain(std::iter::repeat_n(0u8, needed_padding_bytes))
+        .chunks(4) // reverse 4-byte chunks
+        .into_iter()
+        .flat_map(|chunk| chunk.collect::<Vec<u8>>().into_iter().rev())
+        .chunks(64) // collect 64-byte chunks
+        .into_iter()
+        .map(|mut chunk| std::array::from_fn(|_| chunk.next().unwrap()))
+        .collect()
+}
+
+/// Returns a script that pushes the given message onto the stack for BLAKE3.
+///
+/// The script transforms the message into the correct format
+/// and pushes the result onto the stack.
+///
+/// ## Panics
+///
+/// This function panics if the message is longer than 1024 bytes,
+/// since our BLAKE3 implementation doesn't support longer messages.
+pub fn blake3_push_message_script_with_limb(message_bytes: &[u8], limb_len: u8) -> Script {
+    assert!(
+        message_bytes.len() <= 1024,
+        "This BLAKE3 implementation doesn't support messages longer than 1024 bytes"
+    );
+    let chunks = chunk_message(message_bytes);
+
+    script! {
+        for chunk in chunks.into_iter().rev() {
+            for (i, byte) in chunk.into_iter().enumerate() {
+                {
+                    byte
+                }
+                if i == 31 || i == 63 {
+                    {
+                        U256::transform_limbsize(8, limb_len as u32)
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Number of elements in total of all tables
+const SUM_OF_FULL_TABLES: usize = 384;
+
+/// Number of elements of an unpacked block
+const UNPACKED_BLOCK: usize = 128;
+
+/// Maximum number of elements in stack during the execution of BLAKE3 algorithm
+const MAX_BLAKE3_ELEMENT_COUNT: usize =
+    SUM_OF_FULL_TABLES + UNPACKED_BLOCK + /* Extra BLAKE3 variables */ 132;
+
+/// Calculates the maximum number of altstack elements one can have using the [`blake3_compute_script`] function with the following formula:
+/// ```text
+///  n (number of blocks) = ⌈msg_len / 64⌉
+///  limb_count (number of limbs in a block) = ⌈256 / limb_len⌉ * 2
+///  m (message's consumption of stack during BLAKE3) = (n - 1) * limb_count
+///  Since BLAKE3 requires an empty stack and we've calculated the usage for the message and the algorithm:
+///  MAX_NUMBEROF_ALTSTACK_ELEMENTS = 1000 (max stack limit) - m - 644 (Maximum number of elements used during BLAKE3)
+/// ```
+pub fn maximum_number_of_altstack_elements_using_blake3(message_len: usize, limb_len: u8) -> i32 {
+    let n = message_len.div_ceil(64);
+    let limb_count = 256usize.div_ceil(limb_len as usize) * 2;
+    let m = (n - 1) * limb_count;
+    1000_i32 - MAX_BLAKE3_ELEMENT_COUNT as i32 - m as i32
+}
+
+/// Returns a script that computes the BLAKE3 hash of the message on the stack.
+///
+/// The script processes compact message blocks and only unpacks them when needed,
+/// resulting in higher stack efficiency and support for larger messages.
+///
+/// ## Parameters
+///
+/// - `msg_len`: Length of the message. (excluding the padding, number of bytes)
+/// - `limb_len`: Limb length (number of bits per element) that the input in the stack is packed, for example it is 29 for current field elements
+///
+/// ## Message Format Requirements
+///
+/// - __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 the form U256 where each message block is comprised of two U256, each represented with elements consisting of `limb_len` bits
+/// - The input message must unpack to a multiple of 128 nibbles, so pushing padding bytes is necessary
+/// - __BLAKE3 uses exactly [`MAX_BLAKE3_ELEMENT_COUNT`] = 644 elements at maximum, including the tables__ \
+///   With the max stack limit 1000, __you are allowed to have at most 356 elements including the message (excluding the first block of it) in stack (in total, of altstack and stack)__ \
+///   Note that smaller `limb_len`'s means more elements, hence more stack usage \
+///   For a more certain number, you can look into and use [`maximum_number_of_altstack_elements_using_blake3`]
+/// - A message of `n` blocks is expected in the following format:
+///
+/// ```text
+/// block_n_part_0 : U256
+/// block_n_part_1 : U256
+/// ...
+/// block_0_part_0 : U256
+/// block_0_part_1 : U256 (top of the stack)
+/// ```
+/// ## Panics
+///
+/// - If `msg_len` is greater than 1024 bytes, the function panics with an assertion error.
+/// - Given script might not also fit on the max stack limit with messages smaller than 1024 bytes \
+///   if the `limb_len` is small or input stacks has other elements (in the altstack)
+/// - If `limb_len` is not in the range [4, 32)
+/// - If the input doesn't unpack to a multiple of 128 nibbles with the given limb length parameter.
+/// - If the stack contains elements other than the message, script fails to execute.
+///
+/// ## Implementation
+///
+/// 1. Defines stack variables for compact message blocks.
+/// 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. (in nibbles)
+pub fn blake3_compute_script_with_limb(message_len: usize, limb_len: u8) -> Script {
+    assert!(
+        message_len <= 1024,
+        "This BLAKE3 implementation doesn't support messages longer than 1024 bytes"
+    );
+    let mut stack = StackTracker::new();
+    let use_full_tables = true;
+    let message_len = message_len as u32; // safety: message_len <= 1024 << u32::MAX
+    blake3(&mut stack, message_len, true, use_full_tables, limb_len);
+    stack.get_script()
+}
+
+/// Uses [`blake3_compute_script_with_limb`].with limb length 29, see the documentation of it for more details
+pub fn blake3_compute_script(message_len: usize) -> Script {
+    blake3_compute_script_with_limb(message_len, 29)
+}
+
+/// Returns a script that verifies the BLAKE3 output on the stack.
+///
+/// The script pops the BLAKE3 output and compares it with the given, expected output.
+pub fn blake3_verify_output_script(expected_output: [u8; 32]) -> Script {
+    script! {
+        for (i, byte) in expected_output.into_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
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::bn254::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::{execute_script, execute_script_buf_without_stack_limit};
+    use bitcoin::ScriptBuf;
+    use bitcoin_script_stack::optimizer;
+
+    // All tests are run with `USEFUL_LIMB_LENGTHS` lengths, and ignored tests are run with `ALL_POSSIBLE_LIMB_LENGTHS`
+    // If any changes are done to the BLAKE3 code, running the tests with all possible lengths is a good idea
+    // You can use either of the following commands for that:
+    // cargo test all_limbs -- --ignored
+    // cargo test hash::blake3 -- --ignored
+
+    const USEFUL_LIMB_LENGTHS: [u8; 2] = [4, 29];
+
+    const ALL_POSSIBLE_LIMB_LENGTHS: [u8; 28] = [
+        4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+        28, 29, 30, 31,
+    ];
+
+    fn verify_blake_output_with_limbs(message: &[u8], expected_hash: [u8; 32], limb_lens: &[u8]) {
+        for limb_len in limb_lens.iter().copied() {
+            let mut bytes = blake3_push_message_script_with_limb(message, limb_len)
+                .compile()
+                .to_bytes();
+            let optimized = optimizer::optimize(
+                blake3_compute_script_with_limb(message.len(), limb_len).compile(),
+            );
+            bytes.extend(optimized.to_bytes());
+            bytes.extend(
+                blake3_verify_output_script(expected_hash)
+                    .compile()
+                    .to_bytes(),
+            );
+            let script = ScriptBuf::from_bytes(bytes);
+            assert!(execute_script_buf_without_stack_limit(script).success);
+        }
+    }
+
+    fn verify_blake_outputs_cached_with_limbs<const LEN: usize>(
+        messages: &[[u8; LEN]],
+        expected_hashes: &[[u8; 32]],
+        limb_lens: &[u8],
+    ) {
+        assert_eq!(
+            messages.len(),
+            expected_hashes.len(),
+            "There must be as many messages as there are expected hashes"
+        );
+        for limb_len in limb_lens.iter().copied() {
+            let optimized =
+                optimizer::optimize(blake3_compute_script_with_limb(LEN, limb_len).compile());
+            for (i, message) in messages.iter().enumerate() {
+                let expected_hash = expected_hashes[i];
+
+                let mut bytes = blake3_push_message_script_with_limb(message, limb_len)
+                    .compile()
+                    .to_bytes();
+                bytes.extend_from_slice(optimized.as_bytes());
+                bytes.extend(
+                    blake3_verify_output_script(expected_hash)
+                        .compile()
+                        .to_bytes(),
+                );
+                let script = ScriptBuf::from_bytes(bytes);
+                assert!(execute_script_buf_without_stack_limit(script).success);
+            }
+        }
+    }
+
+    #[test]
+    fn test_zero_length() {
+        let message = [];
+        let expected_hash = *blake3::hash(&message).as_bytes();
+        verify_blake_output_with_limbs(&message, expected_hash, &USEFUL_LIMB_LENGTHS);
+    }
+
+    #[test]
+    fn test_max_length() {
+        let message = [0x00; 1024];
+        let expected_hash = *blake3::hash(&message).as_bytes();
+        verify_blake_output_with_limbs(&message, expected_hash, &USEFUL_LIMB_LENGTHS);
+    }
+
+    #[test]
+    #[should_panic(
+        expected = "This BLAKE3 implementation doesn't support messages longer than 1024 bytes"
+    )]
+    fn test_too_long() {
+        let message = [0x00; 1025];
+        let expected_hash = *blake3::hash(&message).as_bytes();
+        verify_blake_output_with_limbs(&message, expected_hash, &USEFUL_LIMB_LENGTHS);
+    }
+
+    #[test]
+    fn test_single_byte() {
+        let messages: Vec<[u8; 1]> = (0..=255).map(|byte| [byte]).collect();
+        let expected_hashes: Vec<[u8; 32]> = messages
+            .iter()
+            .map(|message| *blake3::hash(message).as_bytes())
+            .collect();
+        verify_blake_outputs_cached_with_limbs(&messages, &expected_hashes, &USEFUL_LIMB_LENGTHS);
+    }
+
+    #[test]
+    #[ignore]
+    fn test_single_byte_with_all_limbs() {
+        let messages: Vec<[u8; 1]> = (0..=255).map(|byte| [byte]).collect();
+        let expected_hashes: Vec<[u8; 32]> = messages
+            .iter()
+            .map(|message| *blake3::hash(message).as_bytes())
+            .collect();
+        verify_blake_outputs_cached_with_limbs(
+            &messages,
+            &expected_hashes,
+            &ALL_POSSIBLE_LIMB_LENGTHS,
+        );
+    }
+
+    fn test_official_test_vectors_with_limbs(limb_lens: &[u8]) {
+        use serde::Deserialize;
+        use std::fs::File;
+        use std::io::BufReader;
+
+        #[derive(Debug, Deserialize)]
+        struct TestVectors {
+            cases: Vec<TestVector>,
+        }
+
+        #[derive(Debug, Deserialize)]
+        struct TestVector {
+            input_len: usize,
+            hash: String,
+        }
+
+        fn read_test_vectors() -> Vec<(Vec<u8>, [u8; 32])> {
+            let path = "src/hash/blake3_official_test_vectors.json";
+            let file = File::open(path).unwrap();
+            let reader = BufReader::new(file);
+
+            let test_vectors: TestVectors = serde_json::from_reader(reader).unwrap();
+            test_vectors
+                .cases
+                .iter()
+                .filter(|vector| vector.input_len <= 1024)
+                .map(|vector| {
+                    let message = (0..251u8).cycle().take(vector.input_len).collect();
+                    let expected_hash = <[u8; 32]>::from_hex(&vector.hash[0..64]).unwrap();
+                    (message, expected_hash)
+                })
+                .collect()
+        }
+
+        let test_vectors = read_test_vectors();
+        for (message, expected_hash) in test_vectors {
+            verify_blake_output_with_limbs(&message, expected_hash, limb_lens);
+        }
+    }
+
+    #[test]
+    fn test_official_test_vectors() {
+        test_official_test_vectors_with_limbs(&USEFUL_LIMB_LENGTHS)
+    }
+
+    #[test]
+    #[ignore]
+    fn test_official_test_vectors_with_all_limbs() {
+        test_official_test_vectors_with_limbs(&ALL_POSSIBLE_LIMB_LENGTHS)
+    }
+
+    fn test_blake3_stack_space(
+        blake3_script: Script,
+        message_len: usize,
+        limb_len: u8,
+        extra_elements: i32,
+    ) -> bool {
+        let message = vec![0u8; message_len];
+        execute_script(script! {
+            for _ in 0..extra_elements {
+                { -1 } OP_TOALTSTACK
+            }
+            { blake3_push_message_script_with_limb(&message, limb_len) }
+            { blake3_script.clone() }
+            for _ in 0..extra_elements {
+                OP_FROMALTSTACK OP_DROP
+            }
+            for _ in 0..64 {
+                OP_DROP
+            }
+            OP_TRUE
+        })
+        .success
+    }
+
+    fn test_maximum_alstack_element_calculation_with_limbs(limb_lens: &[u8]) {
+        for limb_len in limb_lens.iter().copied() {
+            for message_len in (64..=1024).step_by(64) {
+                // Block count depends on ceil(message_len / 64)
+                let blake3_script = blake3_compute_script_with_limb(message_len, limb_len);
+                let maximum_extra_elements =
+                    maximum_number_of_altstack_elements_using_blake3(message_len, limb_len);
+                if maximum_extra_elements < 0 {
+                    assert!(!test_blake3_stack_space(
+                        blake3_script.clone(),
+                        message_len,
+                        limb_len,
+                        0
+                    ));
+                } else {
+                    assert!(test_blake3_stack_space(
+                        blake3_script.clone(),
+                        message_len,
+                        limb_len,
+                        maximum_extra_elements
+                    ));
+                    assert!(!test_blake3_stack_space(
+                        blake3_script.clone(),
+                        message_len,
+                        limb_len,
+                        maximum_extra_elements + 1
+                    ));
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_maximum_alstack_element_calculation() {
+        test_maximum_alstack_element_calculation_with_limbs(&USEFUL_LIMB_LENGTHS);
+    }
+
+    #[test]
+    #[ignore]
+    fn test_maximum_alstack_element_calculation_with_all_limbs() {
+        test_maximum_alstack_element_calculation_with_limbs(&ALL_POSSIBLE_LIMB_LENGTHS);
+    }
+
+    #[test]
+    fn test_failure_on_invalid_input() {
+        let zero = script! {
+            {0} {0} {0} {0} {0} {0} {0} {0} {0}
+        };
+        let fake_zero = script! {
+            {0} {0} {0} {0} {0} {0} {0} {0} {-1}
+        };
+        let res = execute_script(script! {
+            // fake_zero has same hash as zero
+            {zero.clone()} {zero.clone()} {blake3_compute_script(64)}
+            for _ in 0..64 {
+                OP_TOALTSTACK
+            }
+            {zero.clone()} {fake_zero.clone()} {blake3_compute_script(64)}
+        });
+        println! {"{:?} {:?} {:?} {:?}", res.success, res.final_stack, res.stats, res.last_opcode};
+        assert_eq!(res.success, false);
+        assert_eq!(res.last_opcode, Some(bitcoin::opcodes::all::OP_VERIFY));
+    }
+}
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_utils.rs b/bitvm/src/hash/blake3_utils.rs
new file mode 100644
index 000000000..b6da45675
--- /dev/null
+++ b/bitvm/src/hash/blake3_utils.rs
@@ -0,0 +1,637 @@
+use crate::u4::{u4_add_stack::*, u4_logic_stack::*, u4_shift_stack::*};
+pub use bitcoin_script::builder::StructuredScript as Script;
+use bitcoin_script_stack::stack::{StackTracker, StackVariable};
+use std::collections::HashMap;
+
+// 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(crate) struct TablesVars {
+    modulo: StackVariable,
+    quotient: StackVariable,
+    shift_tables: StackVariable,
+    xor_table: StackVariable,
+    depth_lookup: StackVariable,
+    use_full_tables: bool,
+}
+
+impl TablesVars {
+    pub(crate) 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(crate) 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.
+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)
+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.
+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.
+///
+/// Variables in `to_copy` are copied and the original remains on the stack.
+/// Variables in `to_move` are consumed from the stack.
+fn u4_add_direct(
+    stack: &mut StackTracker,
+    to_copy: Vec<StackVariable>,
+    mut to_move: Vec<&mut StackVariable>,
+    tables: &TablesVars,
+) {
+    let nibble_count = 8;
+    let number_count = to_copy.len() + to_move.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);
+        }
+
+        //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)]
+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, vec![vb], vec![&mut va, &mut m_two_i], tables);
+    } else {
+        u4_add_direct(stack, vec![vb, m_two_i], vec![&mut va], 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, vec![vd], vec![&mut vc], 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,
+            vec![vb],
+            vec![&mut va, &mut m_two_i_plus_one],
+            tables,
+        );
+    } else {
+        u4_add_direct(stack, vec![vb, m_two_i_plus_one], vec![&mut va], 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, vec![vd], vec![&mut vc], 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
+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
+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
+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(counter));
+    state.push(stack.number_u32(0));
+    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(crate) 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
+
+    // final_rounds must be 8, if you need more than 32 output bytes, you need to change this
+    assert_eq!(final_rounds, 8);
+
+    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(crate) 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::*;
+    pub use bitcoin_script::script;
+    use bitcoin_script_stack::{script_util::verify_n, stack::StackTracker};
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_rrot7() {
+        let mut stack = StackTracker::new();
+        let tables = TablesVars::new(&mut stack, true);
+
+        let ret = [stack.number_u32(0xdeadbeaf), 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/src/hash/mod.rs b/bitvm/src/hash/mod.rs
similarity index 66%
rename from src/hash/mod.rs
rename to bitvm/src/hash/mod.rs
index d7ee1148f..73e0c3e9a 100644
--- a/src/hash/mod.rs
+++ b/bitvm/src/hash/mod.rs
@@ -1,6 +1,5 @@
 pub mod blake3;
-pub mod blake3_u32;
-pub mod blake3_u4;
+pub mod blake3_utils;
 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 97%
rename from src/hash/sha256.rs
rename to bitvm/src/hash/sha256.rs
index 3d400ec6f..2d875a562 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! {
@@ -914,12 +913,30 @@ pub fn maj(x: u32, y: u32, z: u32, stack_depth: u32) -> Script {
 
 #[cfg(test)]
 mod tests {
-    use crate::hash::blake3::push_bytes_hex;
     use crate::hash::sha256::*;
     use crate::treepp::{execute_script, script};
     use crate::u32::u32_std::{u32_equal, u32_equalverify};
+    use bitcoin::hex::{DisplayHex, FromHex};
     use sha2::{Digest, Sha256};
 
+    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 }
+            }
+        }
+    }
+
     fn rrot(x: u32, n: usize) -> u32 {
         if n == 0 {
             return x;
@@ -937,13 +954,13 @@ mod tests {
         );
         let hex_in = "6162636462636465636465666465666765666768666768696768696a68696a6b696a6b6c6a6b6c6d6b6c6d6e6c6d6e6f6d6e6f706e6f70716f7071727071727371727374727374757374757674757677";
         let mut hasher = Sha256::new();
-        let data = hex::decode(hex_in).unwrap();
+        let data = Vec::<u8>::from_hex(hex_in).unwrap();
         hasher.update(&data);
         let mut result = hasher.finalize();
         hasher = Sha256::new();
         hasher.update(result);
         result = hasher.finalize();
-        let res = hex::encode(result);
+        let res = result.to_lower_hex_string();
         let script = script! {
             {push_bytes_hex(hex_in)}
             {sha256(hex_in.len()/2)}
@@ -1179,13 +1196,13 @@ mod tests {
         // 01000000 0000000000000000000000000000000000000000000000000000000000000000 3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a 29ab5f49 ffff001d 1dac2b7c
         let block_header = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c";
         let mut hasher = Sha256::new();
-        let data = hex::decode(block_header).unwrap();
+        let data = Vec::<u8>::from_hex(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 res = result.to_lower_hex_string();
         let genesis_block_hash = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000";
         assert_eq!(res.as_str(), genesis_block_hash);
         let script = script! {
diff --git a/src/hash/sha256_u4.rs b/bitvm/src/hash/sha256_u4.rs
similarity index 93%
rename from src/hash/sha256_u4.rs
rename to bitvm/src/hash/sha256_u4.rs
index fe3cf8c70..802451a88 100644
--- a/src/hash/sha256_u4.rs
+++ b/bitvm/src/hash/sha256_u4.rs
@@ -142,11 +142,12 @@ pub fn calculate_s(
 }
 
 fn get_w_pos(i: u32) -> u32 {
-    
     (i + 1) * 8
 }
 
-fn get_extra_pos(i: u32) -> u32 { (i - 16) * 8 }
+fn get_extra_pos(i: u32) -> u32 {
+    (i - 16) * 8
+}
 
 fn get_pos_var(name: char) -> u32 {
     let i = match name {
@@ -189,15 +190,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 +216,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)
 
         }
     }
@@ -252,7 +253,9 @@ pub fn schedule_iteration(
     }
 }
 
-fn get_full_w_pos(top_table: u32, i: u32) -> u32 { top_table - (i + 1) * 8 }
+fn get_full_w_pos(top_table: u32, i: u32) -> u32 {
+    top_table - (i + 1) * 8
+}
 
 pub fn sha256(num_bytes: u32) -> Script {
     // up to 55 is one block and always supports add table
@@ -276,9 +279,9 @@ pub fn sha256(num_bytes: u32) -> Script {
     println!("{:?}", bytes_per_chunk);
     println!("{:?}", padding_scripts);
 
-    let add_size = 130;
+    let add_size = 128;
     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 +318,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 +339,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 +455,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() }
@@ -468,6 +471,7 @@ mod tests {
 
     use crate::hash::sha256_u4::*;
     use crate::{execute_script, treepp::script};
+    use bitcoin::hex::{DisplayHex, FromHex};
     use sha2::{Digest, Sha256};
 
     #[test]
@@ -504,18 +508,18 @@ mod tests {
 
     fn test_sha256(hex_in: &str) {
         let mut hasher = Sha256::new();
-        let data = hex::decode(hex_in).unwrap();
+        let data = Vec::<u8>::from_hex(hex_in).unwrap();
         hasher.update(&data);
         let result = hasher.finalize();
-        let res = hex::encode(result);
+        let res = result.to_lower_hex_string();
         println!("Result: {}", res);
 
         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
             }
@@ -540,18 +544,10 @@ mod tests {
     #[test]
     fn test_sha256_strs() {
         let message = "Hello.";
-        let hex: String = message
-            .as_bytes()
-            .iter()
-            .map(|&b| format!("{:02x}", b))
-            .collect();
+        let hex: String = message.as_bytes().to_lower_hex_string();
         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();
+        let hex: String = message.as_bytes().to_lower_hex_string();
         test_sha256(&hex)
     }
 
@@ -615,13 +611,13 @@ mod tests {
         // 01000000 0000000000000000000000000000000000000000000000000000000000000000 3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a 29ab5f49 ffff001d 1dac2b7c
         let block_header = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c";
         let mut hasher = Sha256::new();
-        let data = hex::decode(block_header).unwrap();
+        let data = Vec::<u8>::from_hex(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 res = result.to_lower_hex_string();
         let genesis_block_hash = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000";
         assert_eq!(res.as_str(), genesis_block_hash);
         let script = script! {
diff --git a/src/hash/sha256_u4_stack.rs b/bitvm/src/hash/sha256_u4_stack.rs
similarity index 96%
rename from src/hash/sha256_u4_stack.rs
rename to bitvm/src/hash/sha256_u4_stack.rs
index 966828f42..aee3f0f4b 100644
--- a/src/hash/sha256_u4_stack.rs
+++ b/bitvm/src/hash/sha256_u4_stack.rs
@@ -142,6 +142,7 @@ pub fn padding(num_bytes: u32) -> (Script, u32) {
     )
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn calculate_s_nib(
     stack: &mut StackTracker,
     number: [StackVariable; 8],
@@ -185,6 +186,7 @@ pub fn calculate_s_nib(
     res
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn ch1_calculation_nib_stack(
     stack: &mut StackTracker,
     e: StackVariable,
@@ -212,6 +214,7 @@ pub fn ch1_calculation_nib_stack(
     var
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn maj1_calculation_nib_stack(
     stack: &mut StackTracker,
     a: StackVariable,
@@ -260,12 +263,7 @@ pub fn u4_add_nibble_stack(
     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,
-            );
+            let out = stack.custom_ex(u4_add_carry_nested(0, number_count), 1, output_vars, 0);
             *carry = out[1];
             out[0]
         } else {
@@ -338,12 +336,12 @@ pub fn sha256_stack(
     let (lookup, xor_table) = if use_full_xor {
         (
             u4_push_full_lookup_table_stack(stack),
-            u4_push_xor_full_table_stack(stack),
+            u4_push_full_xor_table_stack(stack),
         )
     } else {
         (
-            u4_push_lookup_table_stack(stack),
-            u4_push_xor_table_stack(stack),
+            u4_push_half_lookup_table_0_based_stack(stack),
+            u4_push_half_xor_table_stack(stack),
         )
     };
 
@@ -386,10 +384,7 @@ pub fn sha256_stack(
             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(),
-                );
+                stack.rename(sched[nib], format!("schedule[{}][{}]", i, nib).as_str());
             }
 
             schedule.push(sched);
@@ -703,9 +698,9 @@ pub fn sha256_stack(
         // if last chunk drop the tables
         if c == chunks - 1 {
             // reverse the order of the variables
-            for i in 0..INITSTATE_MAPPING.len() {
+            for a in &INITSTATE_MAPPING {
                 for nib in 0..8 {
-                    stack.move_var(initstate[&INITSTATE_MAPPING[i]][nib as usize]);
+                    stack.move_var(initstate[a][nib as usize]);
                 }
             }
 
@@ -720,9 +715,8 @@ pub fn sha256_stack(
         }
         stack.set_breakpoint("dropped");
     }
-    for i in 0..INITSTATE_MAPPING.len() {
-        *varmap.get_mut(&INITSTATE_MAPPING[i]).unwrap() =
-            stack.from_altstack_count(8).try_into().unwrap();
+    for a in &INITSTATE_MAPPING {
+        *varmap.get_mut(a).unwrap() = stack.from_altstack_count(8).try_into().unwrap();
     }
 
     stack.set_breakpoint("final");
@@ -732,11 +726,12 @@ pub fn sha256_stack(
 
 #[cfg(test)]
 mod tests {
-    use bitcoin_script::Script as StructuredScript;
-    use bitcoin_script_stack::stack::{script, Script, StackTracker};
-
     use super::*;
     use crate::execute_script;
+    use crate::u4::u4_std::u4_drop;
+    use bitcoin::hex::{DisplayHex, FromHex};
+    use bitcoin_script::Script as StructuredScript;
+    use bitcoin_script_stack::stack::{script, Script, StackTracker};
     use sha2::{Digest, Sha256};
 
     #[test]
@@ -783,10 +778,10 @@ mod tests {
     }
     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();
+        let data = Vec::<u8>::from_hex(hex_in).unwrap();
         hasher.update(&data);
         let result = hasher.finalize();
-        let res = hex::encode(result);
+        let res = result.to_lower_hex_string();
         println!("Result: {}", res);
 
         let mut stack = StackTracker::new();
@@ -861,18 +856,10 @@ mod tests {
     #[test]
     fn test_sha256_strs() {
         let message = "Hello.";
-        let hex: String = message
-            .as_bytes()
-            .iter()
-            .map(|&b| format!("{:02x}", b))
-            .collect();
+        let hex: String = message.as_bytes().to_lower_hex_string();
         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();
+        let hex: String = message.as_bytes().to_lower_hex_string();
         test_sha256(&hex, true, true)
     }
 
@@ -936,13 +923,13 @@ mod tests {
         // 01000000 0000000000000000000000000000000000000000000000000000000000000000 3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a 29ab5f49 ffff001d 1dac2b7c
         let block_header = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c";
         let mut hasher = Sha256::new();
-        let data = hex::decode(block_header).unwrap();
+        let data = Vec::<u8>::from_hex(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 res = result.to_lower_hex_string();
         let genesis_block_hash = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000";
         assert_eq!(res.as_str(), genesis_block_hash);
 
diff --git a/src/lib.rs b/bitvm/src/lib.rs
similarity index 85%
rename from src/lib.rs
rename to bitvm/src/lib.rs
index ca9582432..10265cb1a 100644
--- a/src/lib.rs
+++ b/bitvm/src/lib.rs
@@ -2,6 +2,7 @@
 // Re-export what is needed to write treepp scripts
 pub mod treepp {
     pub use crate::execute_script;
+    pub use crate::execute_script_without_stack_limit;
     pub use crate::run;
     pub use bitcoin_script::{script, Script};
 }
@@ -18,9 +19,7 @@ use bitcoin_scriptexec::{Exec, ExecCtx, ExecError, ExecStats, Options, Stack, Tx
 
 pub mod bigint;
 pub mod bn254;
-pub mod bridge;
-pub mod chunker;
-pub mod fflonk;
+pub mod chunk;
 pub mod groth16;
 pub mod hash;
 pub mod pseudo;
@@ -53,9 +52,16 @@ impl fmt::Display for FmtStack {
 }
 
 impl FmtStack {
-    pub fn len(&self) -> usize { self.0.len() }
+    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) }
+    pub fn get(&self, index: usize) -> Vec<u8> {
+        self.0.get(index)
+    }
 }
 
 impl fmt::Debug for FmtStack {
@@ -94,7 +100,7 @@ impl fmt::Display for ExecuteInfo {
                 writeln!(f, "Remaining Script: {}...", string)?;
             }
         }
-        if self.final_stack.len() > 0 {
+        if !self.final_stack.is_empty() {
             match f.width() {
                 None => writeln!(f, "Final Stack: {:4}", self.final_stack)?,
                 Some(width) => {
@@ -111,9 +117,34 @@ impl fmt::Display for ExecuteInfo {
 }
 
 pub fn execute_script(script: treepp::Script) -> ExecuteInfo {
+    execute_script_buf_optional_stack_limit(script.compile(), true)
+}
+
+pub fn execute_script_buf(script: bitcoin::ScriptBuf) -> ExecuteInfo {
+    execute_script_buf_optional_stack_limit(script, true)
+}
+
+pub fn execute_script_without_stack_limit(script: treepp::Script) -> ExecuteInfo {
+    execute_script_buf_optional_stack_limit(script.compile(), false)
+}
+
+pub fn execute_script_buf_without_stack_limit(script: bitcoin::ScriptBuf) -> ExecuteInfo {
+    execute_script_buf_optional_stack_limit(script, false)
+}
+
+/// Executing a script on stack without `MAX_STACK_SIZE` limit is only for testing purposes \
+/// Don't use in production without the stack limit (i.e. `stack_limit` set to false)
+fn execute_script_buf_optional_stack_limit(
+    script: bitcoin::ScriptBuf,
+    stack_limit: bool,
+) -> ExecuteInfo {
+    let opts = Options {
+        enforce_stack_limit: stack_limit,
+        ..Default::default()
+    };
     let mut exec = Exec::new(
         ExecCtx::Tapscript,
-        Options::default(),
+        opts,
         TxTemplate {
             tx: Transaction {
                 version: bitcoin::transaction::Version::TWO,
@@ -125,7 +156,7 @@ pub fn execute_script(script: treepp::Script) -> ExecuteInfo {
             input_idx: 0,
             taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
         },
-        script.compile(),
+        script,
         vec![],
     )
     .expect("error creating exec");
@@ -135,6 +166,7 @@ pub fn execute_script(script: treepp::Script) -> ExecuteInfo {
             break;
         }
     }
+
     let res = exec.result().unwrap();
     ExecuteInfo {
         success: res.success,
@@ -214,7 +246,7 @@ pub fn dry_run_taproots(tx: &Transaction, prevouts: &[TxOut]) -> Result<(), Exec
     let taproot_indices = prevouts
         .iter()
         .enumerate()
-        .filter(|(idx, prevout)| prevout.script_pubkey.as_script().is_p2tr()) // only taproots
+        .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);
 
@@ -241,60 +273,17 @@ pub fn run(script: treepp::Script) {
             exec_result.last_opcode, exec_result.final_stack
         );
     }
-    println!("Max_stack_items = {}", exec_result.stats.max_nb_stack_items);
+    //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.
-    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(),
-    }
-}
-
 pub fn execute_raw_script_with_inputs(script: Vec<u8>, witness: Vec<Vec<u8>>) -> 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 opts = Options {
+        enforce_stack_limit: false,
+        ..Default::default()
+    };
 
     let mut exec = Exec::new(
         ExecCtx::Tapscript,
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..96bff0d9b
--- /dev/null
+++ b/bitvm/src/signatures/mod.rs
@@ -0,0 +1,12 @@
+mod public;
+pub mod signing_winternitz;
+pub mod utils;
+pub mod winternitz;
+
+pub use public::{
+    CompactWots, GenericWinternitzPublicKey, WinternitzSecret, WinternitzSigningInputs, Wots,
+    Wots16, Wots32, Wots4, Wots64, Wots80, LOG2_BASE,
+};
+
+/// Byte length of messages of the standard WOTS implementation used in BitVM.
+pub const HASH_LEN: usize = 16;
diff --git a/bitvm/src/signatures/public.rs b/bitvm/src/signatures/public.rs
new file mode 100644
index 000000000..970f2b8c6
--- /dev/null
+++ b/bitvm/src/signatures/public.rs
@@ -0,0 +1,878 @@
+use bitcoin::hex::DisplayHex;
+use bitcoin::script::read_scriptint;
+use bitcoin_script::Script;
+
+use crate::signatures::utils::bitcoin_representation;
+use crate::signatures::winternitz;
+use crate::signatures::winternitz::{
+    BruteforceVerifier, Converter, ListpickVerifier, Parameters, VoidConverter, Winternitz,
+};
+
+/// Secret key for Winternitz signatures.
+///
+/// The same key type is used for all message lengths.
+pub type WinternitzSecret = winternitz::SecretKey;
+
+/// Public key for some Winternitz signature verification algorithm.
+///
+/// The key has to be converted into the right length before it can be used
+/// in any algorithm. The conversion might fail.
+pub type GenericWinternitzPublicKey = winternitz::PublicKey;
+
+/// Bundles a message with a secret key for signing.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct WinternitzSigningInputs<'a, 'b, WOTS: Wots + ?Sized> {
+    pub message: &'a WOTS::Message,
+    pub signing_key: &'b WinternitzSecret,
+}
+
+/// Number of bits per digit.
+///
+/// We hardcode the base to be 16. Therefore, there are 4 bits.
+pub const LOG2_BASE: u32 = 4;
+
+/// High-level functionality for working with Winternitz signatures.
+///
+/// Signatures contain the signature of each digit as well as the digit itself.
+///
+/// ## See
+///
+/// [`CompactWots`]
+pub trait Wots {
+    type Converter: Converter;
+    type PublicKey: AsRef<[[u8; 20]]> + TryFrom<Vec<[u8; 20]>, Error: std::fmt::Debug>;
+    type Message: AsRef<[u8]> + TryFrom<Vec<u8>, Error: std::fmt::Debug>;
+    type Signature: AsRef<[[u8; 21]]> + TryFrom<Vec<[u8; 21]>, Error: std::fmt::Debug>;
+
+    const ALGORITHM: Winternitz<ListpickVerifier, Self::Converter> = Winternitz::new();
+    const MSG_BYTE_LEN: u32;
+    const PARAMETERS: Parameters = Parameters::new_by_bit_length(Self::MSG_BYTE_LEN * 8, LOG2_BASE);
+    const TOTAL_DIGIT_LEN: u32 = Self::PARAMETERS.total_digit_len();
+
+    /// Generates a random secret key.
+    fn generate_secret_key() -> WinternitzSecret {
+        let mut buffer = [0u8; 20];
+        let mut rng = rand::rngs::OsRng;
+        rand::RngCore::fill_bytes(&mut rng, &mut buffer);
+        Vec::from(buffer)
+    }
+
+    /// Creates a secret key from the given `secret` string.
+    ///
+    /// ## Warning
+    ///
+    /// For backwards compatibility, the original conversion function is used.
+    /// The `secret` string is converted into ASCII bytes,
+    /// which are in turn converted into lower hex ASCII bytes.
+    #[deprecated(note = "It is safer to use Vec<u8> directly")]
+    fn secret_from_str(secret: &str) -> WinternitzSecret {
+        secret.as_bytes().to_lower_hex_string().into_bytes()
+    }
+
+    /// Generates a public key for the given `secret_key`.
+    fn generate_public_key(secret_key: &WinternitzSecret) -> Self::PublicKey {
+        let pubkey_vec = winternitz::generate_public_key(&Self::PARAMETERS, secret_key);
+        match Self::PublicKey::try_from(pubkey_vec) {
+            Ok(public_key) => public_key,
+            _ => unreachable!(),
+        }
+    }
+
+    /// Generates a signature for the given `secret_key` and `message`,
+    /// in form of a Bitcoin witness.
+    fn sign_to_raw_witness(
+        secret_key: &WinternitzSecret,
+        message: &Self::Message,
+    ) -> bitcoin::Witness {
+        let witness = Self::ALGORITHM.sign(&Self::PARAMETERS, secret_key, message.as_ref());
+        debug_assert_eq!(witness.len(), 2 * Self::TOTAL_DIGIT_LEN as usize);
+        witness
+    }
+
+    /// Generates a signature for the given `secret_key` and `message`.
+    fn sign(secret_key: &WinternitzSecret, message: &Self::Message) -> Self::Signature {
+        let witness = Self::sign_to_raw_witness(secret_key, message);
+        Self::raw_witness_to_signature(&witness)
+    }
+
+    /// Generates a signature for the given `inputs`.
+    fn sign_inputs(inputs: WinternitzSigningInputs<Self>) -> Self::Signature {
+        let witness = Self::sign_inputs_to_raw_witness(inputs);
+        Self::raw_witness_to_signature(&witness)
+    }
+
+    /// Generates a signature for the given `inputs` in form of a Bitcoin witness.
+    fn sign_inputs_to_raw_witness(inputs: WinternitzSigningInputs<Self>) -> bitcoin::Witness {
+        Self::sign_to_raw_witness(inputs.signing_key, inputs.message)
+    }
+
+    /// Parses the given bitcoin `witness` as a Winternitz signature.
+    ///
+    /// The `witness` must be in the format that is returned by [`Wots::sign`].
+    ///
+    /// ## Panics
+    ///
+    /// This method panics if the `witness` is ill-formatted.
+    fn raw_witness_to_signature(witness: &bitcoin::Witness) -> Self::Signature {
+        assert_eq!(witness.len(), 2 * Self::TOTAL_DIGIT_LEN as usize);
+        let mut digit_signatures: Vec<[u8; 21]> =
+            Vec::with_capacity(Self::TOTAL_DIGIT_LEN as usize);
+
+        for i in (0..witness.len()).step_by(2) {
+            assert_eq!(
+                witness[i].len(),
+                20,
+                "the digit signature should be constant 20 bytes"
+            );
+            assert!(
+                witness[i + 1].len() <= 2,
+                "the digit should be in compressed bytes, which is equal the empty vector for digit = 0"
+            );
+            let digit_value = read_scriptint(&witness[i + 1]).unwrap();
+            assert!(
+                (0..(1 << LOG2_BASE)).contains(&digit_value),
+                "the digit should be in the valid range"
+            );
+            let mut digit_signature: [u8; 21] = [0; 21];
+            digit_signature[0..20].copy_from_slice(&witness[i]);
+            digit_signature[20] = digit_value as u8;
+            digit_signatures.push(digit_signature);
+        }
+
+        debug_assert_eq!(digit_signatures.len(), Self::TOTAL_DIGIT_LEN as usize);
+        match Self::Signature::try_from(digit_signatures) {
+            Ok(signature) => signature,
+            _ => unreachable!(),
+        }
+    }
+
+    /// Encodes the given Winternitz `signature` as a bitcoin witness.
+    fn signature_to_raw_witness(signature: &Self::Signature) -> bitcoin::Witness {
+        let mut witness = bitcoin::Witness::new();
+
+        for digit_signature in signature.as_ref().iter() {
+            witness.push(&digit_signature[0..20]);
+            witness.push(bitcoin_representation(i32::from(digit_signature[20])));
+        }
+
+        witness
+    }
+
+    /// Extracts the message bytes from the given Winternitz `signature`.
+    fn signature_to_message(signature: &Self::Signature) -> Self::Message {
+        let digits: Vec<u8> = signature
+            .as_ref()
+            .iter()
+            .map(|digit_sig| digit_sig[20])
+            // Remove the checksum at the end
+            .take(Self::PARAMETERS.message_digit_len as usize)
+            // Un-reverse digits
+            .rev()
+            .collect();
+        // Convert little endian digits [LSD, MSD] to big endian [MSD, LSD].
+        // "LSD" means "least significant digit" and
+        // "MSD" means "most significant digit".
+        let bytes = digits
+            .chunks(2)
+            .map(|bn| (bn[1] << 4) + bn[0])
+            .collect::<Vec<u8>>();
+        debug_assert_eq!(bytes.len(), Self::MSG_BYTE_LEN as usize);
+        Self::Message::try_from(bytes).unwrap()
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The converted message is on the stack top.
+    /// The checksum is consumed.
+    fn checksig_verify(public_key: &Self::PublicKey) -> Script {
+        Self::ALGORITHM.checksig_verify(&Self::PARAMETERS, &public_key.as_ref().to_vec())
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature (in the verifier's format) is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The message and checksum are consumed.
+    fn checksig_verify_and_clear_stack(public_key: &Self::PublicKey) -> Script {
+        Self::ALGORITHM
+            .checksig_verify_and_clear_stack(&Self::PARAMETERS, &public_key.as_ref().to_vec())
+    }
+}
+
+/// High-level functionality for working with compact Winternitz signatures.
+///
+/// Compact signatures contain the signature of each digit, but not the digit itself.
+///
+/// ## See
+///
+/// [`Wots`]
+pub trait CompactWots: Wots {
+    type CompactSignature: AsRef<[[u8; 20]]> + TryFrom<Vec<[u8; 20]>, Error: std::fmt::Debug>;
+    const COMPACT_ALGORITHM: Winternitz<BruteforceVerifier, Self::Converter> = Winternitz::new();
+
+    /// Generates a compact signature for the given `secret_key` and `message`,
+    /// in form of a Bitcoin witness.
+    fn compact_sign_to_raw_witness(
+        secret_key: &WinternitzSecret,
+        message: &Self::Message,
+    ) -> bitcoin::Witness {
+        let witness = Self::COMPACT_ALGORITHM.sign(&Self::PARAMETERS, secret_key, message.as_ref());
+        debug_assert_eq!(witness.len(), Self::TOTAL_DIGIT_LEN as usize);
+        witness
+    }
+
+    /// Generates a compact signature for the given `secret_key` and `message`.
+    fn compact_sign(
+        secret_key: &WinternitzSecret,
+        message: &Self::Message,
+    ) -> Self::CompactSignature {
+        let witness = Self::compact_sign_to_raw_witness(secret_key, message);
+        Self::compact_raw_witness_to_signature(&witness)
+    }
+
+    /// Parses the given bitcoin `witness` as a Winternitz signature.
+    ///
+    /// The `witness` must be in the format that is returned by [`CompactWots::compact_sign`].
+    ///
+    /// ## Panics
+    ///
+    /// This method panics if the `witness` is ill-formatted.
+    fn compact_raw_witness_to_signature(witness: &bitcoin::Witness) -> Self::CompactSignature {
+        assert_eq!(witness.len(), Self::TOTAL_DIGIT_LEN as usize);
+        let mut digit_signatures: Vec<[u8; 20]> =
+            Vec::with_capacity(Self::TOTAL_DIGIT_LEN as usize);
+
+        for i in 0..witness.len() {
+            assert_eq!(
+                witness[i].len(),
+                20,
+                "the digit signature should be constant 20 bytes"
+            );
+
+            let digit_signature: [u8; 20] = witness[i].try_into().unwrap();
+            digit_signatures.push(digit_signature);
+        }
+
+        debug_assert_eq!(digit_signatures.len(), Self::TOTAL_DIGIT_LEN as usize);
+        match Self::CompactSignature::try_from(digit_signatures) {
+            Ok(signature) => signature,
+            _ => unreachable!(),
+        }
+    }
+
+    /// Encodes the given Winternitz `signature` as a bitcoin witness.
+    fn compact_signature_to_raw_witness(signature: &Self::CompactSignature) -> bitcoin::Witness {
+        let mut witness = bitcoin::Witness::new();
+
+        for digit_signature in signature.as_ref().iter() {
+            witness.push(digit_signature);
+        }
+
+        witness
+    }
+
+    /// Converts the given Winternitz `signature` into the compact format.
+    fn signature_to_compact_signature(signature: &Self::Signature) -> Self::CompactSignature {
+        let digit_signatures: Vec<[u8; 20]> = signature
+            .as_ref()
+            .iter()
+            .map(|digit_sig| std::array::from_fn(|i| digit_sig[i]))
+            .collect();
+        Self::CompactSignature::try_from(digit_signatures).unwrap()
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The converted message is on the stack top.
+    /// The checksum is consumed.
+    fn compact_checksig_verify(public_key: &Self::PublicKey) -> Script {
+        Self::COMPACT_ALGORITHM.checksig_verify(&Self::PARAMETERS, &public_key.as_ref().to_vec())
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature (in the verifier's format) is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The message and checksum are consumed.
+    fn compact_checksig_verify_and_clear_stack(public_key: &Self::PublicKey) -> Script {
+        Self::COMPACT_ALGORITHM
+            .checksig_verify_and_clear_stack(&Self::PARAMETERS, &public_key.as_ref().to_vec())
+    }
+}
+
+/// Winternitz signatures for 4-byte messages.
+pub struct Wots4;
+/// Winternitz signatures for 16-byte messages.
+pub struct Wots16;
+/// Winternitz signatures for 32-byte messages.
+pub struct Wots32;
+/// Winternitz signatures for 64-byte messages.
+pub struct Wots64;
+/// Winternitz signatures for 80-byte messages.
+pub struct Wots80;
+
+/// Implements the [`Wots`] and [`CompactWots`] traits for the given type.
+///
+/// ## Parameters
+///
+/// - `name`: name of the implementing type
+/// - `msg_byte_len`: message length in bytes
+/// - `converter`: a type that implements the [`Converter`] trait
+#[macro_export]
+macro_rules! impl_wots {
+    ($name:ident, $msg_byte_len:expr, $converter:ty) => {
+        impl Wots for $name {
+            /// Converts the message on the stack after signature verification has finished.
+            type Converter = $converter;
+            /// The public key type for this Winternitz signing algorithm.
+            type PublicKey = [[u8; 20]; Self::TOTAL_DIGIT_LEN as usize];
+            /// The message type for this Winternitz signing algorithm.
+            ///
+            /// All messages have the same fixed length.
+            type Message = [u8; Self::MSG_BYTE_LEN as usize];
+            /// The signature type of this Winternitz signing algorithm.
+            type Signature = [[u8; 21]; Self::TOTAL_DIGIT_LEN as usize];
+
+            /// The number of bytes in a message.
+            const MSG_BYTE_LEN: u32 = $msg_byte_len;
+        }
+
+        impl CompactWots for $name {
+            /// The compact signature type of this Winternitz signing algorithm.
+            type CompactSignature = [[u8; 20]; Self::TOTAL_DIGIT_LEN as usize];
+        }
+    };
+}
+
+impl_wots!(Wots4, 4, VoidConverter);
+impl_wots!(Wots16, 16, VoidConverter);
+impl_wots!(Wots32, 32, VoidConverter);
+impl_wots!(Wots64, 64, VoidConverter);
+impl_wots!(Wots80, 80, VoidConverter);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::signatures::winternitz::ToBytesConverter;
+    use crate::u32::u32_std::u32_compress;
+    use crate::{bn254::g1::G1Affine, execute_script, signatures::utils};
+    use crate::{execute_script_with_inputs, ExecuteInfo};
+
+    use std::convert::TryFrom;
+    use std::fs::File;
+    use std::io;
+    use std::io::Read;
+
+    #[expect(unused_imports)]
+    use std::io::Write; // needed to generate test vectors (see below)
+
+    use ark_ff::UniformRand as _;
+    use ark_std::test_rng;
+    use bitcoin::hex::{DisplayHex, FromHex};
+    use bitcoin::script::read_scriptint;
+    use bitcoin_script::script;
+    use rand::{RngCore as _, SeedableRng as _};
+    use serde::ser::SerializeSeq;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use serde_json;
+
+    /// Extracts the items of the final stack after execution.
+    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
+        })
+    }
+
+    /// Returns a Bitcoin script that compares two elements of length `n`.
+    ///
+    /// The script consumes its inputs.
+    /// If the two elements are not equal, then the script fails immediately.
+    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
+            }
+        )
+    }
+
+    /// Convert the raw Bitcoin witness into a byte vector.
+    ///
+    /// The witness encodes the signed message in digit form.
+    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 = Wots4::generate_secret_key();
+        let public_key = Wots4::generate_public_key(&secret);
+        let start_time_block_number = 860033_u32;
+        let message = start_time_block_number.to_le_bytes();
+
+        let s = script! {
+          { Wots4::sign_to_raw_witness(&secret, &message) }
+          { Wots4::checksig_verify(&public_key) }
+          { utils::digits_to_number::<{ 4 * 2}, { LOG2_BASE as usize }>() }
+          { start_time_block_number }
+          OP_EQUAL
+        };
+
+        let result = execute_script(s);
+
+        assert!(result.success);
+    }
+
+    #[test]
+    fn test_generate_winternitz_secret_length() {
+        let secret = Wots4::generate_secret_key();
+        assert_eq!(secret.len(), 20, "Secret: {0:?}", secret);
+    }
+
+    #[test]
+    fn test_winternitz_public_key_from_secret_length() {
+        let secret = Wots16::generate_secret_key();
+        let public_key = Wots16::generate_public_key(&secret);
+
+        assert_eq!(
+            public_key.len(),
+            Wots16::PARAMETERS.total_digit_len() as usize,
+        );
+
+        for i in 0..Wots16::PARAMETERS.total_digit_len() {
+            assert_eq!(
+                public_key[i as usize].len(),
+                20,
+                "public_key[{}]: {:?}",
+                i,
+                public_key[i as usize]
+            );
+        }
+    }
+
+    /// Winternitz signatures for 72-byte messages.
+    ///
+    /// This is a custom implementation for the G1 unit test.
+    /// The checksig script converts the message to bytes.
+    struct Wots72;
+
+    impl_wots!(Wots72, 72, ToBytesConverter);
+
+    #[test]
+    fn test_recover_g1_point_on_stack() {
+        const G1_POINT_BYTES_LENGTH: usize = 9 * 4 * 2; // two fq elements
+        assert_eq!(G1_POINT_BYTES_LENGTH, 72);
+
+        let secret = Wots72::generate_secret_key();
+        let public_key = Wots72::generate_public_key(&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)}
+        });
+        let g1_to_bytes = u32_witness_to_bytes(extract_witness_from_stack(res));
+        let g1_to_bytes: [u8; G1_POINT_BYTES_LENGTH] = g1_to_bytes.try_into().unwrap();
+
+        println!("g1_to_bytes: {:?}", g1_to_bytes.as_hex());
+
+        let witness = Wots72::sign_to_raw_witness(&secret, &g1_to_bytes);
+        let u32s_size = G1_POINT_BYTES_LENGTH / 4;
+
+        let s = script! {
+            { Wots72::checksig_verify(&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
+            }
+            { 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);
+    }
+
+    #[test]
+    fn secret_key_from_string() {
+        assert_eq!(
+            Wots16::secret_from_str("password").to_lower_hex_string(),
+            "37303631373337333737366637323634"
+        );
+    }
+
+    /// Test vector for WOTS.
+    ///
+    /// A message is signed with the WOTS implementation for the given length,
+    /// using the provided secret key.
+    ///
+    /// The test vector records the expected signature, ranging over all possible formats:
+    /// - non-compact signature
+    /// - non-compact Bitcoin witness
+    /// - compact signature
+    /// - compact Bitcoin witness
+    ///
+    /// The expected Bitcoin witness data is included to ensure compliance
+    /// with Bitcoin consensus rules and to track any changes to the witness
+    /// in future versions of BitVM.
+    #[derive(Serialize, Deserialize)]
+    struct TestVector {
+        #[serde(
+            serialize_with = "serialize_bytes_hex",
+            deserialize_with = "deserialize_bytes_hex"
+        )]
+        message: Vec<u8>,
+        #[serde(
+            serialize_with = "serialize_bytes_hex",
+            deserialize_with = "deserialize_bytes_hex",
+            rename = "secretKey"
+        )]
+        secret_key: Vec<u8>,
+        #[serde(
+            serialize_with = "serialize_byte_matrix_hex",
+            deserialize_with = "deserialize_byte_matrix_hex",
+            rename = "publicKey"
+        )]
+        public_key: Vec<Vec<u8>>,
+        #[serde(
+            serialize_with = "serialize_byte_matrix_hex",
+            deserialize_with = "deserialize_byte_matrix_hex"
+        )]
+        witness: Vec<Vec<u8>>,
+        #[serde(
+            serialize_with = "serialize_byte_matrix_hex",
+            deserialize_with = "deserialize_byte_matrix_hex"
+        )]
+        signature: Vec<Vec<u8>>,
+        #[serde(
+            serialize_with = "serialize_byte_matrix_hex",
+            deserialize_with = "deserialize_byte_matrix_hex"
+        )]
+        compact_witness: Vec<Vec<u8>>,
+        #[serde(
+            serialize_with = "serialize_byte_matrix_hex",
+            deserialize_with = "deserialize_byte_matrix_hex"
+        )]
+        compact_signature: Vec<Vec<u8>>,
+    }
+
+    fn serialize_bytes_hex<S>(bytes: &[u8], serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&bytes.to_lower_hex_string())
+    }
+
+    fn deserialize_bytes_hex<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        Vec::<u8>::from_hex(&s).map_err(serde::de::Error::custom)
+    }
+
+    fn serialize_byte_matrix_hex<S>(
+        byte_matrix: &[Vec<u8>],
+        serializer: S,
+    ) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut seq = serializer.serialize_seq(Some(byte_matrix.len()))?;
+        for entry in byte_matrix {
+            seq.serialize_element(&entry.to_lower_hex_string())?;
+        }
+        seq.end()
+    }
+
+    fn deserialize_byte_matrix_hex<'de, D>(deserializer: D) -> Result<Vec<Vec<u8>>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let vec_s: Vec<String> = Vec::deserialize(deserializer)?;
+        vec_s
+            .into_iter()
+            .map(|s| Vec::<u8>::from_hex(&s).map_err(serde::de::Error::custom))
+            .collect()
+    }
+
+    /// Creates a test vector for the given `WOTS` implementation.
+    ///
+    /// The test vector stores the output of signing the given `message`
+    /// with the given `secret_key`.
+    #[allow(dead_code)]
+    fn create_test_vector<WOTS: Wots + CompactWots>(
+        message: &WOTS::Message,
+        secret_key: WinternitzSecret,
+    ) -> TestVector {
+        let public_key: Vec<Vec<u8>> = WOTS::generate_public_key(&secret_key)
+            .as_ref()
+            .iter()
+            .map(|entry| entry.to_vec())
+            .collect();
+        let witness: Vec<Vec<u8>> = WOTS::sign_to_raw_witness(&secret_key, message)
+            .iter()
+            .map(|entry| entry.to_vec())
+            .collect();
+        let signature: Vec<Vec<u8>> = WOTS::sign(&secret_key, message)
+            .as_ref()
+            .iter()
+            .map(|entry| entry.to_vec())
+            .collect();
+        let compact_witness: Vec<Vec<u8>> = WOTS::compact_sign_to_raw_witness(&secret_key, message)
+            .iter()
+            .map(|entry| entry.to_vec())
+            .collect();
+        let compact_signature: Vec<Vec<u8>> = WOTS::compact_sign(&secret_key, message)
+            .as_ref()
+            .iter()
+            .map(|entry| entry.to_vec())
+            .collect();
+
+        TestVector {
+            message: message.as_ref().to_vec(),
+            secret_key,
+            public_key,
+            witness,
+            signature,
+            compact_witness,
+            compact_signature,
+        }
+    }
+
+    /// Creates randomized test vectors for the given `WOTS` implementation.
+    #[allow(dead_code)]
+    fn generate_test_vectors_for<WOTS: Wots + CompactWots, const MSG_BYTE_LEN: usize>(
+    ) -> Vec<TestVector> {
+        // Working around limitations of the Rust compiler
+        debug_assert_eq!(WOTS::MSG_BYTE_LEN as usize, MSG_BYTE_LEN);
+
+        let mut test_vectors = Vec::new();
+
+        // Sign all-zeroes message
+        let message = WOTS::Message::try_from(vec![0x00; MSG_BYTE_LEN]).unwrap();
+        let secret_key = WOTS::generate_secret_key();
+        test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+
+        // Sign all-zeroes message where signature has trailing zero byte
+        'grind_trailing_zero: loop {
+            let secret_key = WOTS::generate_secret_key();
+            let witness = WOTS::sign_to_raw_witness(&secret_key, &message);
+            for entry in &witness {
+                if entry.last().map(|&byte| byte == 0).unwrap_or(false) {
+                    test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+                    break 'grind_trailing_zero;
+                }
+            }
+        }
+
+        // Sign all-zeroes message where signature has leading zero byte
+        'grind_leading_zero: loop {
+            let secret_key = WOTS::generate_secret_key();
+            let witness = WOTS::sign_to_raw_witness(&secret_key, &message);
+            for entry in &witness {
+                if entry.first().map(|&byte| byte == 0).unwrap_or(false) {
+                    test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+                    break 'grind_leading_zero;
+                }
+            }
+        }
+
+        // Sign all-ones message
+        let message = WOTS::Message::try_from(vec![0xff; MSG_BYTE_LEN]).unwrap();
+        let secret_key = WOTS::generate_secret_key();
+        test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+
+        // Sign random message
+        let message: Vec<u8> = (0..MSG_BYTE_LEN).map(|_| rand::random()).collect();
+        let message = WOTS::Message::try_from(message).unwrap();
+        let secret_key = WOTS::generate_secret_key();
+        test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+
+        // Sign half-zeroes, half-ones message
+        let message: Vec<u8> = (0..MSG_BYTE_LEN / 2)
+            .map(|_| 0x00u8)
+            .chain((0..MSG_BYTE_LEN / 2).map(|_| 0xffu8))
+            .collect();
+        let message = WOTS::Message::try_from(message).unwrap();
+        let secret_key = WOTS::generate_secret_key();
+        test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+
+        // Sign third-zeroes, third-ones, third-random message
+        let message: Vec<u8> = (0..MSG_BYTE_LEN / 3)
+            .map(|_| 0x00u8)
+            .chain((0..MSG_BYTE_LEN / 3).map(|_| 0xffu8))
+            .chain((0..MSG_BYTE_LEN - MSG_BYTE_LEN / 3 * 2).map(|_| rand::random()))
+            .collect();
+        let message = WOTS::Message::try_from(message).unwrap();
+        let secret_key = WOTS::generate_secret_key();
+        test_vectors.push(create_test_vector::<WOTS>(&message, secret_key));
+
+        test_vectors
+    }
+
+    // Uncomment and run this code to generate fresh test vectors:
+    // cargo test generate_and_save_test_vectors
+    /*
+    #[test]
+    fn generate_and_save_test_vectors() -> io::Result<()> {
+        let mut test_vectors = Vec::new();
+        test_vectors.extend(generate_test_vectors_for::<Wots4, 4>());
+        test_vectors.extend(generate_test_vectors_for::<Wots16, 16>());
+        test_vectors.extend(generate_test_vectors_for::<Wots32, 32>());
+
+        let json = serde_json::to_string_pretty(&test_vectors)?;
+
+        let file = File::create("wots-test-vectors.json")?;
+        let mut writer = io::BufWriter::new(file);
+        writer.write_all(json.as_bytes())?;
+        writer.flush()?;
+
+        Ok(())
+    }
+    */
+
+    fn load_test_vectors() -> io::Result<Vec<TestVector>> {
+        let mut file = File::open("wots-test-vectors.json")?;
+
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)?;
+
+        let test_vectors: Vec<TestVector> = serde_json::from_str(&contents)
+            .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
+
+        Ok(test_vectors)
+    }
+
+    /// Run the test vector and verify the expected outputs.
+    fn verify_test_vector<WOTS: Wots + CompactWots>(test_vector: TestVector) {
+        let message =
+            WOTS::Message::try_from(test_vector.message.clone()).expect("Invalid message bytes");
+        let computed_public_key = WOTS::generate_public_key(&test_vector.secret_key);
+        assert_eq!(
+            &test_vector.public_key,
+            computed_public_key.as_ref(),
+            "public key mismatch"
+        );
+        let computed_signature = WOTS::sign(&test_vector.secret_key, &message);
+        assert_eq!(
+            &test_vector.signature,
+            computed_signature.as_ref(),
+            "signature mismatch"
+        );
+        let computed_witness = WOTS::sign_to_raw_witness(&test_vector.secret_key, &message);
+        assert_eq!(
+            &test_vector.witness,
+            &computed_witness.to_vec(),
+            "witness mismatch"
+        );
+        assert_eq!(
+            WOTS::raw_witness_to_signature(&computed_witness).as_ref(),
+            computed_signature.as_ref(),
+            "bad conversion witness -> signature"
+        );
+        assert_eq!(
+            &WOTS::signature_to_raw_witness(&computed_signature),
+            &computed_witness,
+            "bad conversion signature -> witness"
+        );
+        let script = script! {
+            { computed_witness }
+            { WOTS::checksig_verify_and_clear_stack(&computed_public_key) }
+            OP_TRUE
+        };
+        assert!(execute_script(script).success);
+
+        let computed_compact_signature = WOTS::compact_sign(&test_vector.secret_key, &message);
+        assert_eq!(
+            &test_vector.compact_signature,
+            computed_compact_signature.as_ref(),
+            "compact signature mismatch"
+        );
+        let computed_compact_witness =
+            WOTS::compact_sign_to_raw_witness(&test_vector.secret_key, &message);
+        assert_eq!(
+            &test_vector.compact_witness,
+            &computed_compact_witness.to_vec(),
+            "compact witness mismatch"
+        );
+        assert_eq!(
+            WOTS::compact_raw_witness_to_signature(&computed_compact_witness).as_ref(),
+            computed_compact_signature.as_ref(),
+            "bad conversion compact witness -> compact signature"
+        );
+        assert_eq!(
+            &WOTS::compact_signature_to_raw_witness(&computed_compact_signature),
+            &computed_compact_witness,
+            "bad conversion compact signature -> compact witness"
+        );
+        let compact_script = script! {
+            { computed_compact_witness }
+            { WOTS::compact_checksig_verify_and_clear_stack(&computed_public_key) }
+            OP_TRUE
+        };
+        assert!(execute_script(compact_script).success);
+    }
+
+    #[test]
+    fn verify_test_vectors() -> io::Result<()> {
+        let test_vectors = load_test_vectors()?;
+
+        for test_vector in test_vectors {
+            match test_vector.message.len() {
+                4 => verify_test_vector::<Wots4>(test_vector),
+                16 => verify_test_vector::<Wots16>(test_vector),
+                32 => verify_test_vector::<Wots32>(test_vector),
+                _ => panic!("Unexpected message length: {}", test_vector.message.len()),
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/bitvm/src/signatures/signing_winternitz.rs b/bitvm/src/signatures/signing_winternitz.rs
new file mode 100644
index 000000000..76b4c6f35
--- /dev/null
+++ b/bitvm/src/signatures/signing_winternitz.rs
@@ -0,0 +1,309 @@
+use bitcoin::hex::DisplayHex;
+use bitcoin::Witness;
+use serde::{Deserialize, Serialize};
+
+use crate::treepp::{script, Script};
+use crate::{
+    signatures::winternitz::{
+        generate_public_key, BruteforceVerifier, ListpickVerifier, Parameters, PublicKey,
+        SecretKey, ToBytesConverter, VoidConverter, Winternitz,
+    },
+    u32::u32_std::u32_compress,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
+pub struct WinternitzSecret {
+    pub secret_key: SecretKey,
+    parameters: Parameters,
+}
+
+/// Bits per digit.
+pub const LOG_D: u32 = 4;
+
+/// Winternitz verifier, returns the message in digits.
+pub const WINTERNITZ_MESSAGE_VERIFIER: Winternitz<ListpickVerifier, VoidConverter> =
+    Winternitz::new();
+
+/// Winternitz verifier, returns the message in bytes.
+pub const WINTERNITZ_VARIABLE_VERIFIER: Winternitz<ListpickVerifier, ToBytesConverter> =
+    Winternitz::new();
+
+/// Winternitz verifier for compact signature representation, returns the message in bytes.
+pub const WINTERNITZ_MESSAGE_COMPACT_VERIFIER: Winternitz<BruteforceVerifier, VoidConverter> =
+    Winternitz::new();
+
+impl WinternitzSecret {
+    /// Creates a secret key from a 160-bit random number,
+    /// for signing messages of the given `message_len` (in bytes).
+    pub fn new(message_len: usize) -> Self {
+        let mut buffer = [0u8; 20];
+        let mut rng = rand::rngs::OsRng;
+        rand::RngCore::fill_bytes(&mut rng, &mut buffer);
+
+        Self::from_bytes(message_len, buffer.to_lower_hex_string().into())
+    }
+
+    /// Creates a secret key from the given `secret_bytes`,
+    /// for signing messages of the given `message_len` (in bytes).
+    pub fn from_bytes(message_len: usize, secret_bytes: Vec<u8>) -> Self {
+        let parameters = Parameters::new_by_bit_length(message_len as u32 * 8, LOG_D);
+        Self {
+            secret_key: secret_bytes,
+            parameters,
+        }
+    }
+
+    /// Creates a secret key from the given `secret` string.
+    ///
+    /// ## Warning
+    ///
+    /// The `secret` string is converted into ASCII bytes,
+    /// which are in turn converted into lower hex ASCII bytes.
+    #[deprecated(note = "It is safer to use WinternitzSecret::from_bytes")]
+    pub fn from_string(secret: &str, parameters: &Parameters) -> Self {
+        WinternitzSecret {
+            secret_key: secret.as_bytes().to_lower_hex_string().into(),
+            parameters: *parameters,
+        }
+    }
+}
+
+#[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,
+        }
+    }
+}
+
+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_witness(signing_inputs: &WinternitzSigningInputs) -> Witness {
+    WINTERNITZ_MESSAGE_VERIFIER.sign(
+        &signing_inputs.signing_key.parameters,
+        &signing_inputs.signing_key.secret_key,
+        signing_inputs.message,
+    )
+}
+
+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::{bn254::g1::G1Affine, execute_script, signatures::utils};
+    use crate::{execute_script_with_inputs, ExecuteInfo};
+    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 = 20;
+
+    /// Extracts the items of the final stack after execution.
+    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
+        })
+    }
+
+    /// Returns a Bitcoin script that compares two elements of length `n`.
+    ///
+    /// The script consumes its inputs.
+    /// If the two elements are not equal, then the script fails immediately.
+    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
+            }
+        )
+    }
+
+    /// Convert the raw Bitcoin witness into a byte vector.
+    ///
+    /// The witness encodes the signed message in digit form.
+    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) }
+          { utils::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_digit_len() {
+            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_digit_len() as usize
+        );
+        for i in 0..public_key.parameters.total_digit_len() {
+            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)}
+        });
+        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..b31ddf23d
--- /dev/null
+++ b/bitvm/src/signatures/utils.rs
@@ -0,0 +1,182 @@
+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 given `checksum` into a vector of digits.
+///
+/// ## Output format
+///
+/// - sequence of `n_digits` many digits
+/// - each digit a `u32` value in range `0..base`
+/// - checksum converted into BE bytes, in turn converted into digits
+pub(super) fn checksum_to_digits(mut checksum: u32, base: u32, n_digits: u32) -> Vec<u32> {
+    debug_assert!((16..=256).contains(&base));
+    debug_assert!(
+        base.checked_pow(n_digits)
+            .map(|upper_limit| checksum < upper_limit)
+            .unwrap_or(true),
+        "Checksum is too large to fit into the given number of digits"
+    );
+
+    let mut digits = vec![0; n_digits as usize]; // cast safety: 32-bit machine or higher
+
+    for digit in digits.iter_mut().rev() {
+        *digit = checksum % base;
+        checksum = (checksum - *digit) / base;
+    }
+
+    digits
+}
+
+/// Converts the given `message` into a vector of digits.
+///
+/// ## Output format
+///
+/// - sequence of `n_digits` many digits
+/// - each digit a `u32` value in range `0..2.pow(log2_base)`
+/// - message bytes are reversed (but not their nibbles!)
+pub(crate) fn message_to_digits(n_digits: u32, log2_base: u32, message: &[u8]) -> Vec<u32> {
+    debug_assert!((4..=8).contains(&log2_base));
+    debug_assert!(
+        message.len() as u32 * 8 <= n_digits * log2_base,
+        "Message is too long to fit into the given number of digits"
+    );
+
+    let mut digits = vec![0u32; n_digits as usize]; // cast safety: 32-bit machine or higher
+    let mut digit_idx: u32 = 0;
+    let mut bit_idx: u32 = 0;
+
+    for mut byte in message.iter().copied() {
+        for _ in 0..8 {
+            if bit_idx == log2_base {
+                bit_idx = 0;
+                digit_idx += 1;
+            }
+            digits[digit_idx as usize] |= ((byte & 1) as u32) << bit_idx; // cast safety: 32-bit machine or higher
+            byte >>= 1;
+            bit_idx += 1;
+        }
+    }
+
+    digits.reverse();
+    digits
+}
+
+/// Returns a Bitcoin script that converts a message into a number.
+///
+/// ## Precondition
+///
+/// - message is at stack top
+/// - message is split into `N_DIGITS` digits
+/// - each digit is in range `0..2.pow(LOG2_BASE)`
+///
+/// ## Postcondition
+///
+/// - converted number is at stack top
+pub fn digits_to_number<const N_DIGITS: usize, const LOG2_BASE: usize>() -> Script {
+    script! {
+        for _ in 0..N_DIGITS - 1 {
+          OP_TOALTSTACK
+        }
+        for _ in 0..N_DIGITS - 1 {
+            for _ in 0..LOG2_BASE {
+                OP_DUP OP_ADD // simulating OP_MUL
+            }
+            OP_FROMALTSTACK
+            OP_ADD
+        }
+    }
+}
+
+pub fn bitcoin_representation(x: i32) -> Vec<u8> {
+    let mut buf = [0u8; 8];
+    let len = bitcoin::script::write_scriptint(&mut buf, x as i64);
+    return buf[0..len].to_vec();
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::run;
+
+    #[test]
+    fn test_bitcoin_representation() {
+        for i in 0..256 {
+            run(script! {
+                { i }
+                { bitcoin_representation(i) }
+                OP_EQUAL
+            })
+        }
+    }
+
+    #[test]
+    fn checksum_to_digits_endianness() {
+        // Integer is encoded as BE digit sequence
+        assert_eq!(
+            checksum_to_digits(0x12345678, 16, 8),
+            vec![1, 2, 3, 4, 5, 6, 7, 8],
+        );
+    }
+
+    #[test]
+    fn message_to_digits_endianness() {
+        let message: u32 = 0x12345678;
+        // Bytes are reversed from BE to LE
+        // Digits stay BE
+        // The result is a weird mix of endianness
+        assert_eq!(
+            message_to_digits(8, 4, &message.to_be_bytes()),
+            vec![7, 8, 5, 6, 3, 4, 1, 2],
+        );
+        // Bytes are reversed from LE to BE
+        // Digits stay BE
+        // The result is a BE sequence
+        assert_eq!(
+            message_to_digits(8, 4, &message.to_le_bytes()),
+            vec![1, 2, 3, 4, 5, 6, 7, 8],
+        );
+    }
+
+    #[test]
+    fn digits_to_number_endianness() {
+        // LE input is glued together as LE
+        let script = script! {
+            { vec![0x07, 0x08, 0x05, 0x06, 0x03, 0x04, 0x01, 0x02] }
+            { digits_to_number::<8, 4>() }
+            { 0x78563412 }
+            OP_EQUAL
+        };
+        run(script);
+        // BE input is glued together as BE
+        let script = script! {
+            { vec![0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08] }
+            { digits_to_number::<8, 4>() }
+            { 0x12345678 }
+            OP_EQUAL
+        };
+        run(script);
+    }
+
+    #[test]
+    fn message_digits_roundtrip() {
+        let message: u32 = 0x12345678;
+        let digits = message_to_digits(8, 4, &message.to_le_bytes());
+        let script = script! {
+            { digits }
+            { digits_to_number::<8, 4>() }
+            { message }
+            OP_EQUAL
+        };
+        run(script);
+    }
+}
diff --git a/bitvm/src/signatures/winternitz.rs b/bitvm/src/signatures/winternitz.rs
new file mode 100644
index 000000000..75d29250e
--- /dev/null
+++ b/bitvm/src/signatures/winternitz.rs
@@ -0,0 +1,1112 @@
+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>;
+
+/// Parameters for the [`Winternitz`] struct.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone, Copy)]
+pub struct Parameters {
+    /// Number of digits per message (including zero padding at the end).
+    pub(super) message_digit_len: u32,
+    /// Number of bits per digit.
+    pub(super) log2_base: u32,
+    /// Number of digits per checksum.
+    pub(super) checksum_digit_len: u32,
+}
+
+impl Parameters {
+    /// Creates parameters for messages of the given number of digits of the given base.
+    ///
+    /// The log2_base must be in the range `4..=8`.
+    pub const fn new(message_digit_len: u32, log2_base: u32) -> Self {
+        assert!(
+            4 <= log2_base && log2_base <= 8,
+            "log2_base must be in the range 4..=8"
+        );
+        Parameters {
+            message_digit_len,
+            log2_base,
+            checksum_digit_len: log_base_ceil(
+                ((1 << log2_base) - 1) * message_digit_len + 1,
+                1 << log2_base,
+            ),
+        }
+    }
+
+    /// Creates parameters for messages of the given bit length and for digits of the given base.
+    ///
+    /// The log2_base must be in the range `4..=8`.
+    pub const fn new_by_bit_length(message_n_bits: u32, log2_base: u32) -> Self {
+        let message_digit_len = message_n_bits.div_ceil(log2_base);
+        Self::new(message_digit_len, log2_base)
+    }
+
+    /// Maximum value of a digit
+    pub const fn max_digit(&self) -> u32 {
+        (1 << self.log2_base) - 1
+    }
+
+    /// Maximum byte length of supported messages.
+    pub const fn message_byte_len(&self) -> u32 {
+        (self.message_digit_len * self.log2_base).div_ceil(8)
+    }
+
+    /// Total number of digits (message plus checksum).
+    pub const fn total_digit_len(&self) -> u32 {
+        self.message_digit_len + self.checksum_digit_len
+    }
+}
+
+/// Returns the secret key for given digit, appending the representation of it in bigger endian bytes to the message secret key
+pub fn secret_key_for_digit(secret_key: &SecretKey, mut digit_index: u32) -> hash160::Hash {
+    let mut secret_i = secret_key.clone();
+    while digit_index > 0 {
+        secret_i.push((digit_index & 255) as u8);
+        digit_index >>= 8;
+    }
+    hash160::Hash::hash(&secret_i)
+}
+
+/// Returns the signature of a given digit, 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 hash = secret_key_for_digit(secret_key, digit_index);
+    for _ in 0..message_digit {
+        hash = hash160::Hash::hash(&hash[..]);
+    }
+    *hash.as_byte_array()
+}
+
+/// Returns the public key of a given digit, 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 {
+    let mut hash = secret_key_for_digit(secret_key, digit_index);
+    let mut all_possible_digits = vec![hash];
+    for _ in 0..ps.max_digit() {
+        hash = hash160::Hash::hash(&hash[..]);
+        all_possible_digits.push(hash)
+    }
+    all_possible_digits.sort();
+    for i in 0..ps.max_digit() as usize {
+        if all_possible_digits[i] == all_possible_digits[i + 1] {
+            eprintln!("WARNING: Given secret key has repetitive hashes for digit {}, it won't work with brute force verifier", digit_index);
+        }
+    }
+    *hash.as_byte_array()
+}
+
+/// 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_digit_len() as usize);
+    for i in 0..ps.total_digit_len() {
+        public_key.push(public_key_for_digit(ps, secret_key, i));
+    }
+    public_key
+}
+
+/// Computes the checksum for the given message.
+fn checksum(ps: &Parameters, message_digits: &[u32]) -> u32 {
+    debug_assert_eq!(message_digits.len(), ps.message_digit_len as usize);
+
+    let sum: u32 = message_digits.iter().sum();
+    ps.max_digit() * ps.message_digit_len - sum
+}
+
+/// Appends the checksum to the end of the message.
+fn add_message_checksum(ps: &Parameters, mut message_digits: Vec<u32>) -> Vec<u32> {
+    debug_assert_eq!(message_digits.len(), ps.message_digit_len as usize);
+
+    let checksum_digits = checksum_to_digits(
+        checksum(ps, &message_digits),
+        ps.max_digit() + 1,
+        ps.checksum_digit_len,
+    );
+    message_digits.extend(checksum_digits);
+    message_digits
+}
+
+/// Creates and verifies Winternitz signatures.
+pub trait Verifier {
+    /// Creates a Winternitz signature for the given `secret_key` and `digits`.
+    ///
+    /// ## Output format
+    ///
+    /// - `hash(digits[0])`
+    /// - `digits[0]`
+    /// - `hash(digits[1])`
+    /// - `digits[1]`
+    /// - ...
+    /// - `hash(digits[n + m - 1])`
+    /// - `digits[n + m - 1]`
+    ///
+    /// There are `n` message digits followed by `m` checksum digits.
+    /// The checksum is computed internally.
+    fn sign_digits(ps: &Parameters, secret_key: &SecretKey, message_digits: Vec<u32>) -> Witness {
+        let digits = add_message_checksum(ps, message_digits);
+        let mut result = Witness::new();
+        for i in 0..ps.total_digit_len() {
+            let sig = digit_signature(secret_key, i, digits[i as usize]);
+            // FIXME: Do trailing zeroes violate Bitcoin Script's minimum data push requirement?
+            //        Maybe the script! macro removes the zeroes.
+            //        There is a 1/256 chance that a signature contains a trailing zero.
+            result.push(sig);
+            result.push(bitcoin_representation(digits[i as usize] as i32));
+        }
+        result
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// The checksum is verified by a separate Bitcoin script.
+    ///
+    /// ## Precondition
+    ///
+    /// - `hash(digits[0])`
+    /// - `digits[0]`
+    /// - `hash(digits[1])`
+    /// - `digits[1]`
+    /// - ...
+    /// - `hash(digits[n + m - 1])`
+    /// - `digits[n + m - 1]` (stack top)
+    ///
+    /// For `n` message digits followed by `m` checksum digits.
+    ///
+    /// ## Postcondition
+    ///
+    /// - `digits[n + m - 1]`
+    /// - `digits[n + m - 2]`
+    /// - ...
+    /// - `digits[0]` (alt stack top)
+    ///
+    /// The input is consumed from the stack.
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script;
+}
+
+/// Converts the message on the stack after signature verification.
+pub trait Converter {
+    /// Returns a Bitcoin script that converts the message on the stack.
+    fn get_script(ps: &Parameters) -> Script;
+
+    /// Returns the number of stack elements of the conversion output.
+    fn length_of_final_message(ps: &Parameters) -> u32;
+}
+
+/// Marker for the set of used Winternitz algorithms.
+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()
+    }
+}
+
+impl<VERIFIER: Verifier, CONVERTER: Converter> Winternitz<VERIFIER, CONVERTER> {
+    /// Creates a marker for the given [`Verifier`] and [`Converter`].
+    pub const fn new() -> Self {
+        Winternitz {
+            phantom0: PhantomData,
+            phantom1: PhantomData,
+        }
+    }
+
+    /// Creates a Winternitz signature for the given `secret_key` and `digits`.
+    ///
+    /// ## See
+    ///
+    /// [`Verifier::sign_digits`]
+    pub fn sign_digits(
+        &self,
+        ps: &Parameters,
+        secret_key: &SecretKey,
+        digits: Vec<u32>,
+    ) -> Witness {
+        VERIFIER::sign_digits(ps, secret_key, digits)
+    }
+
+    /// Creates a Winternitz signature for the given `secret_key` and `message`.
+    ///
+    /// The message is internally converted into digits.
+    ///
+    /// ## See
+    ///
+    /// [`Verifier::sign_digits`]
+    pub fn sign(&self, ps: &Parameters, secret_key: &SecretKey, message: &[u8]) -> Witness {
+        VERIFIER::sign_digits(
+            ps,
+            secret_key,
+            message_to_digits(ps.message_digit_len, ps.log2_base, message),
+        )
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature (in the verifier's format) is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The converted message is on the stack top.
+    /// The checksum is consumed.
+    ///
+    /// ## See
+    ///
+    /// - [`Verifier::verify_digits`]
+    /// - [`Converter::get_script`]
+    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) }
+        }
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// Signature (in the verifier's format) is at the stack top.
+    ///
+    /// ## Postcondition
+    ///
+    /// The message and checksum are consumed.
+    ///
+    /// ## See
+    ///
+    /// [`Verifier::verify_digits`]
+    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) }
+            for _ in 0..(ps.message_digit_len) / 2 {
+                OP_2DROP
+            }
+            if ps.message_digit_len % 2 == 1 {
+                OP_DROP
+            }
+        }
+    }
+
+    /// Returns a Bitcoin script that verifies the message checksum.
+    ///
+    /// ## Precondition
+    ///
+    /// - `digits[n + m - 1]`
+    /// - `digits[n + m - 2]`
+    /// - ...
+    /// - `digits[0]` (alt stack top)
+    ///
+    /// On the alt stack, there are `m` checksum digits followed by `n` message digits.
+    /// The digits order is flipped.
+    ///
+    /// ## Postcondition
+    ///
+    /// - `digits[0]`
+    /// - `digits[1]`
+    /// - ...
+    /// - `digits[n - 1]` (stack top)
+    ///
+    /// The input is consumed from the alt stack.
+    fn verify_checksum(&self, ps: &Parameters) -> Script {
+        script! {
+            OP_FROMALTSTACK OP_DUP OP_NEGATE
+            for _ in 1..ps.message_digit_len {
+                OP_FROMALTSTACK OP_TUCK OP_SUB // sum the digits and tuck them before the sum so they are stored for later
+            }
+            { ps.max_digit() * ps.message_digit_len }
+            OP_ADD
+            OP_FROMALTSTACK
+            for _ in 0..ps.checksum_digit_len - 1 {
+                for _ in 0..ps.log2_base {
+                    OP_DUP OP_ADD
+                }
+                OP_FROMALTSTACK
+                OP_ADD
+            }
+            OP_EQUALVERIFY
+        }
+    }
+}
+
+/// Winternitz signature verification using lists and `OP_PICK`.
+///
+/// ## 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(digits[0])`
+/// - `digits[0]`
+/// - `hash(digits[1])`
+/// - `digits[1]`
+/// - ...
+/// - `hash(digits[n + m - 1])`
+/// - `digits[n + m - 1]`
+///
+/// There are `n` message digits followed by `m` checksum digits.
+///
+/// ## Approximate Max Stack Depth Used During Verification
+///
+/// 2 * `total_digit_len` + (2 ^ `log2_base`) / 2
+pub struct ListpickVerifier {}
+
+impl Verifier for ListpickVerifier {
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_digit_len() {
+                //two OP_SWAP's are necessary since the signature hash is never on top of the stack. Order of them can be optimized in the future to negate one of the OP_SWAP's.
+                OP_SWAP
+                OP_SIZE
+                { 20 } OP_EQUALVERIFY
+                OP_SWAP
+                // See https://github.com/BitVM/BitVM/issues/35
+                { ps.max_digit() }
+                OP_MIN
+                OP_DUP
+                OP_TOALTSTACK
+                { ps.max_digit().div_ceil(2) }
+                OP_2DUP
+                OP_LESSTHAN
+                OP_IF
+                    OP_DROP
+                    OP_TOALTSTACK
+                    for _ in 0..ps.max_digit().div_ceil(2)  {
+                        OP_HASH160
+                    }
+                OP_ELSE
+                    OP_SUB
+                    OP_TOALTSTACK
+                OP_ENDIF
+                for _ in 0..ps.max_digit()/2 {
+                    OP_DUP OP_HASH160
+                }
+                OP_FROMALTSTACK
+                OP_PICK
+                { (public_key[ps.total_digit_len() as usize - 1 - digit_index as usize]).to_vec() }
+                OP_EQUALVERIFY
+                for _ in 0..(ps.max_digit() + 1) / 4 {
+                    OP_2DROP
+                }
+            }
+        }
+    }
+}
+
+/// Winternitz signature verification using brute force.
+///
+/// ## Verification Algorithm
+///
+/// Tries each possible digit value.
+///
+/// ## Signature Format
+///
+/// - `hash(digit[0])`
+/// - `hash(digit[1])`
+/// - ...
+/// - `hash(digit[n + m - 1])`
+///
+/// There are `n` message digits followed by `m` checksum digits.
+///
+/// ## Approximate Max Stack Depth Used During Verification
+///
+/// `total_length()`
+pub struct BruteforceVerifier {}
+
+impl Verifier for BruteforceVerifier {
+    /// Creates a Winternitz signature for the given `secret_key` and `digits`.
+    ///
+    /// ## Signature Format
+    ///
+    /// - `hash(digit[0])`
+    /// - `hash(digit[1])`
+    /// - ...
+    /// - `hash(digit[n + m - 1])`
+    ///
+    /// There are `n` message digits followed by `m` checksum digits.
+    /// The checksum is computed internally.
+    fn sign_digits(ps: &Parameters, secret_key: &SecretKey, message_digits: Vec<u32>) -> Witness {
+        let digits = add_message_checksum(ps, message_digits);
+        let mut result = Witness::new();
+        for i in 0..ps.total_digit_len() {
+            let sig = digit_signature(secret_key, i, digits[i as usize]);
+            result.push(sig);
+        }
+        result
+    }
+
+    /// Returns a Bitcoin script that verifies a Winternitz signature for the given `public_key`.
+    ///
+    /// ## Precondition
+    ///
+    /// - `hash(digits[0])`
+    /// - `hash(digits[1])`
+    /// - ...
+    /// - `hash(digits[n + m - 1])` (stack top)
+    ///
+    /// There are `n` message digits followed by `m` checksum digits.
+    ///
+    /// ## Postcondition
+    ///
+    /// - `digits[n - 1]`
+    /// - `digits[n - 2]`
+    /// - ...
+    /// - `digits[0]` (alt stack top)
+    ///
+    /// The input is consumed from the stack.
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_digit_len() {
+                OP_SIZE
+                { 20 } OP_EQUALVERIFY
+                { public_key[(ps.total_digit_len() - 1 - digit_index) as usize].to_vec() }
+                OP_SWAP
+                { -1 } OP_TOALTSTACK // To avoid illegal stack access, same -1 is checked later
+                OP_2DUP
+                OP_EQUAL
+                OP_IF
+                    {ps.max_digit()}
+                    OP_TOALTSTACK
+                OP_ENDIF
+                for i in 0..ps.max_digit() {
+                    OP_HASH160
+                    OP_2DUP
+                    OP_EQUAL
+                    OP_IF
+                        { ps.max_digit() - i - 1 }
+                        OP_TOALTSTACK
+                    OP_ENDIF
+                }
+                OP_2DROP
+                OP_FROMALTSTACK
+                OP_DUP
+                { -1 }
+                OP_NUMNOTEQUAL OP_VERIFY
+                OP_FROMALTSTACK
+                { -1 } OP_EQUALVERIFY // Verify the sentinel value -1 to avoid altstack overflow in the rare case where pk == hash160^n(pk).
+                OP_TOALTSTACK
+            }
+        }
+    }
+}
+
+/// Winternitz signature verification using binary search.
+///
+/// ## Verification Algorithm
+///
+/// Simulates a for loop of hashing using binary search on the digit.
+///
+/// ## Signature Format
+///
+/// - `hash(digits[0])`
+/// - `digits[0]`
+/// - `hash(digits[1])`
+/// - `digits[1]`
+/// - ...
+/// - `hash(digits[n + m - 1])`
+/// - `digits[n + m - 1]`
+///
+/// There are `n` message digits followed by `m` checksum digits.
+///
+/// ## Approximate Max Stack Depth Used During Verification
+///
+/// 2 * `total_length()`
+pub struct BinarysearchVerifier {}
+
+impl Verifier for BinarysearchVerifier {
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_digit_len() {
+                //two OP_SWAP's are necessary since the signature hash is never on top of the stack. Order of them can be optimized in the future to negate one of the OP_SWAP's.
+                OP_SWAP
+                OP_SIZE
+                { 20 } OP_EQUALVERIFY
+                OP_SWAP
+                // One can try send digits out of the range, i.e. negative or bigger than D for it to act as in range, but due to bitcoin consensus rules,
+                // OP_IF's fail to execute if their input is not 0 or 1, so OP_IF below marked with (*) does this check already
+                // Note that this behaviour might change in the future with bitcoin consensus rules, so the test [`test_if_binary_search_verifier_allows_out_of_range_digits`] is added to confirm that this works
+                // OP_0
+                // OP_MAX
+                // {ps.max_digit() }
+                // OP_MIN
+                OP_DUP
+                OP_TOALTSTACK
+                { ps.max_digit() } OP_SWAP OP_SUB
+                for bit in (0..ps.log2_base).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_digit_len() - 1 - digit_index) as usize]).to_vec() }
+                OP_EQUALVERIFY
+            }
+        }
+    }
+}
+
+/// Leaves the digits on the stack as they are.
+pub struct VoidConverter {}
+
+impl Converter for VoidConverter {
+    fn length_of_final_message(ps: &Parameters) -> u32 {
+        ps.message_digit_len
+    }
+
+    fn get_script(ps: &Parameters) -> Script {
+        let _ = ps;
+        script! {}
+    }
+}
+
+/// Converts the digits into bytes and leaves them on the stack.
+pub struct ToBytesConverter {}
+
+impl Converter for ToBytesConverter {
+    fn length_of_final_message(ps: &Parameters) -> u32 {
+        ps.message_byte_len()
+    }
+
+    fn get_script(ps: &Parameters) -> Script {
+        if ps.log2_base == 8 {
+            //already bytes
+            script! {}
+        } else if ps.log2_base == 4 {
+            script! {
+                for i in 0..ps.message_digit_len / 2 {
+                    OP_SWAP
+                    for _ in 0..ps.log2_base {
+                        OP_DUP OP_ADD
+                    }
+                    OP_ADD
+                    if i != (ps.message_digit_len / 2) - 1 {
+                        OP_TOALTSTACK
+                    }
+                }
+                if ps.message_digit_len > 1 {
+                    for _ in 0..ps.message_digit_len / 2 - 1{
+                        OP_FROMALTSTACK
+                    }
+                }
+            }
+        } else {
+            let mut lens: Vec<u32> = vec![];
+            let mut split_save = vec![];
+            for i in 0..ps.message_digit_len {
+                let start = i * ps.log2_base;
+                let next_stop = start + 8 - (start % 8);
+                let split = next_stop - start;
+                split_save.push(split);
+                if split >= ps.log2_base {
+                    lens.push(ps.log2_base);
+                } else {
+                    lens.push(split);
+                    lens.push(ps.log2_base - split);
+                }
+            }
+            lens.reverse();
+            let mut last_bytes_var = (8 - (ps.message_digit_len * ps.log2_base % 8)) % 8;
+            let mut is_last_zero_var = true;
+            let mut last_bytes_save = vec![];
+            let mut is_last_zero_save = vec![];
+            for l in lens.clone() {
+                last_bytes_save.push(last_bytes_var);
+                if last_bytes_var >= 8 {
+                    last_bytes_var = 0;
+                    is_last_zero_var = true;
+                }
+                is_last_zero_save.push(is_last_zero_var);
+                is_last_zero_var = false;
+                last_bytes_var += l;
+            }
+
+            script! {
+                for split in split_save {
+                    if split >= ps.log2_base {
+                        OP_TOALTSTACK
+                    } else {
+                        OP_0
+                        for j in (split..ps.log2_base).rev() {
+                            if j != ps.log2_base - 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
+                    }
+                }
+                OP_0
+                for (l, (last_bytes, is_last_zero)) in lens.into_iter().zip(last_bytes_save.into_iter().zip(is_last_zero_save.into_iter())) {
+                    if last_bytes >= 8 {
+                        OP_0
+                    }
+                    if !is_last_zero {
+                        for _ in 0..l {
+                            OP_DUP OP_ADD
+                        }
+                    }
+                    OP_FROMALTSTACK OP_ADD
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use bitcoin::hex::FromHex;
+    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: &[u8], verifier: &str) -> Script {
+        let mut rng = MALICIOUS_RNG.lock().unwrap();
+        let ind = rng.gen_range(0..ps.total_digit_len());
+        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
+                }
+            }
+        }
+    }
+
+    fn test_script(
+        ps: &Parameters,
+        standard_script: Script,
+        message_checker: Script,
+        desired_outcome: bool,
+    ) {
+        println!(
+            "Winternitz signature size:\n \t{:?} bytes / {:?} bits \n\t{:?} bytes / bit\n",
+            standard_script.len(),
+            ps.message_digit_len * ps.log2_base,
+            standard_script.len() as f64 / (ps.message_digit_len * ps.log2_base) as f64
+        );
+        if desired_outcome == true {
+            assert!(
+                execute_script(standard_script.push_script(message_checker.clone().compile()))
+                    .success
+                    == true
+            );
+        } else {
+            assert!(
+                execute_script(standard_script.clone()).success == false
+                    || execute_script(standard_script.push_script(message_checker.compile()))
+                        .success
+                        == true
+            );
+        }
+    }
+
+    fn run_winternitz_test<VERIFIER: Verifier, CONVERTER: Converter>(
+        ps: &Parameters,
+        secret_key: &SecretKey,
+        public_key: &PublicKey,
+        message: &[u8],
+        message_checker: Script,
+        desired_outcome: bool,
+    ) {
+        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_digit_len: {} and log2_base: {} {} with {} =>",
+            ps.message_digit_len,
+            ps.log2_base,
+            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 Vec::<u8>::from_hex(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_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.as_ref()) }
+
+            // 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 Vec::<u8>::from_hex(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_digit_len * ps.log2_base / 8;
+            let mut message = vec![0u8; message_byte_size as usize];
+            let mut return_message = vec![0; ps.message_byte_len() 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.message_byte_len() {
+                    {return_message[i as usize]}
+                    if i == ps.message_byte_len() - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+
+            run_winternitz_test::<ListpickVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker.clone(),
+                true,
+            );
+            run_winternitz_test::<BruteforceVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker.clone(),
+                true,
+            );
+            run_winternitz_test::<BinarysearchVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker,
+                true,
+            );
+
+            let message_digits = message_to_digits(ps.message_digit_len, ps.log2_base, &message);
+            let void_message_checker = script! {
+                for i in (0..ps.message_digit_len).rev() {
+                    { message_digits[i as usize] }
+                    if i == 0 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+
+            run_winternitz_test::<ListpickVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker.clone(),
+                true,
+            );
+            run_winternitz_test::<BruteforceVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker.clone(),
+                true,
+            );
+            run_winternitz_test::<BinarysearchVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker,
+                true,
+            );
+        }
+    }
+
+    #[test]
+    fn test_winternitz_fail() {
+        let secret_key = match Vec::<u8>::from_hex(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_digit_len * ps.log2_base / 8;
+            let mut message = vec![0u8; message_byte_size as usize];
+            let mut return_message = vec![0; ps.message_byte_len() 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.message_byte_len() {
+                    {return_message[i as usize]}
+                    if i == ps.message_byte_len() - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+
+            run_winternitz_test::<ListpickVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker.clone(),
+                false,
+            );
+            run_winternitz_test::<BruteforceVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker.clone(),
+                false,
+            );
+            run_winternitz_test::<BinarysearchVerifier, ToBytesConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                message_checker,
+                false,
+            );
+
+            let message_digits = message_to_digits(ps.message_digit_len, ps.log2_base, &message);
+            let void_message_checker = script! {
+                for i in (0..ps.message_digit_len).rev() {
+                    { message_digits[i as usize] }
+                    if i == 0 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+
+            run_winternitz_test::<ListpickVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker.clone(),
+                false,
+            );
+            run_winternitz_test::<BruteforceVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker.clone(),
+                false,
+            );
+            run_winternitz_test::<BinarysearchVerifier, VoidConverter>(
+                &ps,
+                &secret_key,
+                &public_key,
+                &message,
+                void_message_checker,
+                false,
+            );
+        }
+    }
+
+    #[test]
+    fn test_if_binary_search_verifier_allows_out_of_range_digits() {
+        let secret_key = match Vec::<u8>::from_hex(SAMPLE_SECRET_KEY) {
+            Ok(bytes) => bytes,
+            Err(_) => panic!("Invalid hex string"),
+        };
+        let o = Winternitz::<BinarysearchVerifier, VoidConverter>::new();
+        let ps = Parameters::new_by_bit_length(8, 4); //changing log2_base will break this test
+        let public_key = generate_public_key(&ps, &secret_key);
+        assert_eq!(ps.checksum_digit_len, 2);
+
+        fn signed_checksum(ps: &Parameters, message_digits: &[i32]) -> u32 {
+            debug_assert_eq!(message_digits.len(), ps.message_digit_len as usize);
+
+            let sum: i32 = message_digits.iter().sum();
+            assert!(sum >= 0);
+            ps.max_digit() * ps.message_digit_len - sum as u32
+        }
+
+        fn add_message_signed_checksum(ps: &Parameters, mut message_digits: Vec<i32>) -> Vec<i32> {
+            debug_assert_eq!(message_digits.len(), ps.message_digit_len as usize);
+            let checksum_digits = checksum_to_digits(
+                signed_checksum(ps, &message_digits),
+                ps.max_digit() + 1,
+                ps.checksum_digit_len,
+            );
+            message_digits.extend(checksum_digits.iter().map(|&x| x as i32));
+            message_digits
+        }
+
+        fn sign_signed_digits(
+            ps: &Parameters,
+            secret_key: &SecretKey,
+            message_digits: Vec<i32>,
+        ) -> Witness {
+            let digits = add_message_signed_checksum(ps, message_digits);
+            let mut result = Witness::new();
+            for i in 0..ps.total_digit_len() {
+                let mut impersonator_digit = digits[i as usize];
+                impersonator_digit = impersonator_digit.max(0);
+                impersonator_digit = impersonator_digit.min(ps.max_digit() as i32);
+                let sig = digit_signature(secret_key, i, impersonator_digit as u32);
+                // FIXME: Do trailing zeroes violate Bitcoin Script's minimum data push requirement?
+                //        Maybe the script! macro removes the zeroes.
+                //        There is a 1/256 chance that a signature contains a trailing zero.
+                result.push(sig);
+                result.push(bitcoin_representation(digits[i as usize]));
+            }
+            result
+        }
+
+        assert!(
+            execute_script(script! {
+                { sign_signed_digits(&ps, &secret_key, vec![2, 3]) }
+                { o.checksig_verify_and_clear_stack(&ps, &public_key) }
+                OP_TRUE
+            })
+            .success
+        );
+
+        assert!(
+            !execute_script(script! {
+                { sign_signed_digits(&ps, &secret_key, vec![-1, 1]) }
+                { o.checksig_verify_and_clear_stack(&ps, &public_key) }
+                OP_TRUE
+            })
+            .success
+        );
+
+        assert!(
+            !execute_script(script! {
+                { sign_signed_digits(&ps, &secret_key, vec![20, 0]) }
+                { o.checksig_verify_and_clear_stack(&ps, &public_key) }
+                OP_TRUE
+            })
+            .success
+        );
+    }
+}
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..5a7748f7c
--- /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 67%
rename from src/u32/u32_and.rs
rename to bitvm/src/u32/u32_and.rs
index 4bb47576c..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)
@@ -64,12 +62,11 @@ pub fn u8_and(i: u32) -> Script {
         OP_OVER
         OP_ADD
         OP_ADD
-    }.add_stack_hint(-(i as i32 + 256), -1)
+    }
 }
 
-/// 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,16 +94,11 @@ pub fn u32_and(a: u32, b: u32, stack_size: u32) -> Script {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::run;
-    use crate::treepp::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());
@@ -119,7 +111,7 @@ 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
@@ -129,4 +121,23 @@ mod tests {
             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 72%
rename from src/u32/u32_rrot.rs
rename to bitvm/src/u32/u32_rrot.rs
index eca45b2e3..af175ea73 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,46 @@ 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,14 +181,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) {
+    if let Some(res) = specific_optimize {
         return res;
     }
+
     let remainder: usize = rot_num % 8;
 
     let hbit: usize = 8 - remainder;
@@ -217,15 +215,12 @@ pub fn u32_rrot(rot_num: usize) -> Script {
         OP_FROMALTSTACK
         OP_FROMALTSTACK
         {byte_reorder(offset)}
-    }.add_stack_hint(-4, 0)
+    }
 }
 
 #[cfg(test)]
 mod tests {
-
-    use crate::run;
-    use crate::treepp::script;
-    use crate::u32::u32_rrot::*;
+    use super::*;
     use crate::u32::u32_std::*;
     use rand::Rng;
 
@@ -241,8 +236,8 @@ 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 script = script! {
@@ -255,4 +250,20 @@ mod tests {
             }
         }
     }
+    #[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/src/u32/u32_std.rs b/bitvm/src/u32/u32_std.rs
similarity index 85%
rename from src/u32/u32_std.rs
rename to bitvm/src/u32/u32_std.rs
index 9debca6cc..83c5d2c75 100644
--- a/src/u32/u32_std.rs
+++ b/bitvm/src/u32/u32_std.rs
@@ -1,25 +1,21 @@
-#![allow(dead_code)]
-
-
 use crate::pseudo::{push_to_stack, OP_256MUL, OP_4DUP};
+use crate::treepp::*;
 
-use crate::treepp::{script, Script};
-
-/// Pushes a value as u32 element onto the stack
+/// 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) {
+        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) }
+                { push_to_stack(((value >> 24) & 0xff) as usize, 4) }
         }
         else{
 
-                {value >> 24 & 0xff}
-                {value >> 16 & 0xff}
-                {value >>  8 & 0xff}
+                {(value >> 24) & 0xff}
+                {(value >> 16) & 0xff}
+                {(value >>  8) & 0xff}
                 {value & 0xff}
         }
     }
@@ -39,6 +35,7 @@ pub fn u32_equalverify() -> Script {
         OP_EQUALVERIFY
     }
 }
+
 /// Returns 1 if the top two u32 are equal, 0 otherwise
 pub fn u32_equal() -> Script {
     script! {
@@ -57,24 +54,6 @@ pub fn u32_equal() -> Script {
     }
 }
 
-/// 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! {
@@ -108,7 +87,7 @@ pub fn u32_drop() -> Script {
     }
 }
 
-/// The u32 element n back in the stack is moved to the top.
+/// 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! {
@@ -119,7 +98,7 @@ pub fn u32_roll(n: u32) -> Script {
     }
 }
 
-/// The u32 element n back in the stack is copied to the top.
+/// 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! {
@@ -130,8 +109,7 @@ pub fn u32_pick(n: u32) -> Script {
     }
 }
 
-// X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀ → X₃₁…₀
-/// The top u32 element is compressed into a single 4-byte word
+/// 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₇…₀
@@ -158,7 +136,7 @@ pub fn u32_compress() -> Script {
     }
 }
 
-// X₃₁…₀ → X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀
+// Deompresses the top element into 4 bytes, X₃₁…₀ → X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀
 pub fn u32_uncompress() -> Script {
     script! {
         // ⋯ X₃₁…₀
@@ -242,11 +220,7 @@ pub fn u32_uncompress() -> Script {
 
 #[cfg(test)]
 mod test {
-
-    use crate::run;
-    use crate::treepp::script;
-    use crate::u32::u32_std::*;
-    use rand::Rng;
+    use super::*;
 
     #[test]
     fn test_u32_push() {
@@ -264,16 +238,20 @@ mod test {
         run(script);
     }
 
+    // This unit test has really strange semantics.
+    // A number modulo 1 will always be 0.
+    // I commented out the broken lines and added lines with the current, real semantics.
+    // TODO: If someone knows the intended semantics, please update the unit.
     #[test]
     fn test_with_u32_compress() {
-        let mut rng = rand::thread_rng();
-
+        // 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 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 origin_value0 = 0u32;
+            let origin_value1 = 0u32;
             let v = origin_value0 + origin_value1;
 
             let script = script! {
diff --git a/src/u32/u32_xor.rs b/bitvm/src/u32/u32_xor.rs
similarity index 74%
rename from src/u32/u32_xor.rs
rename to bitvm/src/u32/u32_xor.rs
index 233dd97c6..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)
@@ -76,12 +71,11 @@ pub fn u8_xor(i: u32) -> Script {
         OP_OVER
         OP_ADD
         OP_ADD
-    }.add_stack_hint(-(i as i32 + 256), -1)
+    }
 }
 
-/// 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,20 +330,35 @@ pub fn u8_drop_xor_table() -> Script {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::run;
-    use crate::treepp::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 script = script! {
@@ -359,7 +366,7 @@ mod tests {
                 {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
@@ -369,4 +376,24 @@ mod tests {
             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..19e619bc2 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/src/u4/mod.rs b/bitvm/src/u4/mod.rs
similarity index 87%
rename from src/u4/mod.rs
rename to bitvm/src/u4/mod.rs
index 38e258b86..3d9c929f3 100644
--- a/src/u4/mod.rs
+++ b/bitvm/src/u4/mod.rs
@@ -3,7 +3,6 @@ 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/bitvm/src/u4/u4_add.rs b/bitvm/src/u4/u4_add.rs
new file mode 100644
index 000000000..70c51b29f
--- /dev/null
+++ b/bitvm/src/u4/u4_add.rs
@@ -0,0 +1,349 @@
+use super::u4_std::{u4_drop, CalculateOffset};
+use crate::treepp::*;
+use bitcoin::opcodes::all::*;
+
+/// 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! {
+        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(64)
+}
+
+/// 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..64).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(64)
+}
+
+/// 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 = 64;
+    //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_u64, |sum, &x| sum + x as u64) % (1_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_u64, |sum, &x| sum + x as u64) % (1_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..64 {
+            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..64 {
+            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 60%
rename from src/u4/u4_add_stack.rs
rename to bitvm/src/u4/u4_add_stack.rs
index 00fd9271b..142d10b13 100644
--- a/src/u4/u4_add_stack.rs
+++ b/bitvm/src/u4/u4_add_stack.rs
@@ -1,108 +1,61 @@
-use crate::treepp::script;
+use crate::treepp::*;
 use bitcoin_script_stack::stack::{StackTracker, StackVariable};
 
-use super::u4_add::{u4_add_no_table_internal, u4_push_modulo_table_5, u4_push_quotient_table_5};
+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(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(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")
 }
 
+/// 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,
@@ -132,6 +85,8 @@ pub fn u4_arrange_nibbles_stack(
     }
 }
 
+/// 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,
@@ -167,45 +122,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,
-    to_copy: Vec<StackVariable>,
-    to_move: Vec<&mut StackVariable>,
-    constants: Vec<u32>,
-    quotient_table: StackVariable,
-    modulo_table: StackVariable,
-) {
-    let number_count = to_copy.len() + to_move.len() + constants.len();
-    let number_count = number_count as u32;
-    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() {
@@ -258,28 +178,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();
@@ -306,4 +204,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..e62d4f9c8
--- /dev/null
+++ b/bitvm/src/u4/u4_logic.rs
@@ -0,0 +1,466 @@
+use super::u4_std::u4_drop;
+use crate::treepp::*;
+use crate::u4::u4_add::u4_arrange_nibbles;
+
+/*
+    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 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};
+    use rand::Rng;
+
+    #[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/src/u4/u4_logic_stack.rs b/bitvm/src/u4/u4_logic_stack.rs
similarity index 55%
rename from src/u4/u4_logic_stack.rs
rename to bitvm/src/u4/u4_logic_stack.rs
index 165a870ad..fade3b3ab 100644
--- a/src/u4/u4_logic_stack.rs
+++ b/bitvm/src/u4/u4_logic_stack.rs
@@ -1,26 +1,31 @@
-use crate::treepp::{script, Script};
+use crate::treepp::*;
 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},
+    u4_logic::{
+        u4_push_full_lookup, u4_push_full_xor_table, u4_push_half_and_table, u4_push_half_xor_table,
+    },
     u4_shift_stack::u4_rshift_stack,
 };
 
-pub fn u4_push_and_table_stack(stack: &mut StackTracker) -> StackVariable {
+/// 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")
 }
 
-pub fn u4_push_xor_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(136, u4_push_half_xor_table(), "xor_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")
 }
 
-pub fn u4_push_xor_full_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(256, u4_push_xor_table(), "xor_full_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
@@ -42,36 +47,39 @@ pub fn u4_push_half_lookup_0_based() -> Script {
     }
 }
 
-pub fn u4_push_from_depth_lookup(stack: &mut StackTracker, delta: i32) -> StackVariable {
+/// 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);
+        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;
+        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
-
 }
 
-pub fn u4_push_lookup_table_stack(stack: &mut StackTracker) -> StackVariable {
+/// 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_lookup(), "full_lookup_table")
+    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,
@@ -86,20 +94,8 @@ pub fn u4_logic_with_table_stack(
     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);
-    stack.op_dup();
-    stack.op_add();
-    stack.op_sub();
-    stack.op_add()
-}
-
+/// 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,
@@ -113,123 +109,91 @@ pub fn u4_and_with_xor_stack(
     u4_rshift_stack(stack, shift_table, 1)
 }
 
-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)
-    }
-}
-
-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);
-            }
-            stack.to_altstack();
-        }
-    }
-}
-
 #[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_xor() {
+    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_xor_full_table_stack(&mut stack);
+                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_logic_with_table_stack(&mut stack, lookup, xor);
-
-                stack.number(x ^ 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_half() {
+    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_xor_table_stack(&mut stack);
-                let lookup = u4_push_lookup_table_stack(&mut stack);
-
+                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_with_and_half() {
+    fn test_xor_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);
-
+                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_xor_with_and_stack(&mut stack, lookup, and);
-
+                u4_logic_with_table_stack(&mut stack, lookup, xor);
                 stack.number(x ^ y);
-
                 stack.op_equalverify();
-
                 stack.drop(lookup);
-                stack.drop(and);
-
+                stack.drop(xor);
                 stack.op_true();
-
                 assert!(stack.run().success);
             }
         }
@@ -240,23 +204,16 @@ mod tests {
         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);
-
+                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..bc8c40f39
--- /dev/null
+++ b/bitvm/src/u4/u4_shift.rs
@@ -0,0 +1,203 @@
+use super::u4_std::u4_drop;
+use crate::treepp::*;
+
+/// 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 63%
rename from src/u4/u4_shift_stack.rs
rename to bitvm/src/u4/u4_shift_stack.rs
index d1353996e..695c34c1a 100644
--- a/src/u4/u4_shift_stack.rs
+++ b/bitvm/src/u4/u4_shift_stack.rs
@@ -1,101 +1,31 @@
-use bitcoin_script_stack::stack::{script, Script, StackTracker, StackVariable};
+use super::u4_shift::u4_push_lshift_tables;
+use bitcoin_script::Script;
+use bitcoin_script_stack::stack::{script, StackTracker, StackVariable};
 
-pub fn u4_push_lshift_tables() -> Script {
-    //lshift3, lshift2, lshift1
+/// 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_8
-        OP_0
-        OP_2DUP
-        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_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_3
-    OP_DUP
-    OP_2DUP
-    OP_2
-    OP_DUP
-    OP_2DUP
-    OP_1
-    OP_DUP
-    OP_2DUP
-    OP_0
-    OP_DUP
-    OP_2DUP
+        OP_DUP
+        OP_2DUP
 
-    OP_15
-    OP_DUP
-    OP_14
-    OP_DUP
-    OP_13
-    OP_DUP
-    OP_12
-    OP_DUP
-    OP_11
-    OP_DUP
-    OP_10
-    OP_DUP
-    OP_9
-    OP_DUP
-    OP_8
-    OP_DUP
-    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
-      }
+        for i in (0..16).rev() {
+            { i }
+            OP_DUP
+        }
+    }
 }
 
-// pub fn u4_drop_rshift_tables() -> Script { u4_drop(16 * 3) }
-
+/// Pushes left and right shift tables
 pub fn u4_push_shift_tables_stack(stack: &mut StackTracker) -> StackVariable {
     stack.var(
         16 * 6,
@@ -104,27 +34,23 @@ pub fn u4_push_shift_tables_stack(stack: &mut StackTracker) -> StackVariable {
     )
 }
 
-pub fn u4_rshift_stack(
-    stack: &mut StackTracker,
-    tables: StackVariable,
-    mut n: u32,
-) -> StackVariable {
-    assert!(n > 0 && n <= 3);
+/// 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!((1..4).contains(&n));
     if n == 3 {
         stack.number(8);
         return stack.op_greaterthanorequal();
     }
-    if n == 2 {
-        n += 1;
-    }
-    stack.get_value_from_table(tables, Some(16 * (n - 1)))
+    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! {
@@ -144,52 +70,40 @@ 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
+/// 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!(n > 0 && n <= 3);
+    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() {
@@ -209,14 +123,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..74b73a778 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,
@@ -130,28 +138,27 @@ impl CalculateOffset for i32 {
                 panic!("unexpected opcode: {:?}", element);
             }
         }
-        
+
         Script::new("").push_opcode(element)
     }
 }
 #[cfg(test)]
 mod tests {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u4::u4_std::u4_number_to_nibble;
+    use super::*;
     use super::{u4_hex_to_nibbles, u4_repeat_number};
+    use crate::u4::u4_std::u4_number_to_nibble;
 
     #[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/bitvm/wots-test-vectors.json b/bitvm/wots-test-vectors.json
new file mode 100644
index 000000000..aa9fda1c2
--- /dev/null
+++ b/bitvm/wots-test-vectors.json
@@ -0,0 +1,5000 @@
+[
+  {
+    "message": "00000000",
+    "secretKey": "dc10b366d119fcebf0bcae782302ed92a3c7e835",
+    "publicKey": [
+      "cdac80e4010b5370f4477daf56405dd9b2fd5a22",
+      "940618f02fa8369ea57bfef17a84b651b5b820bd",
+      "97608f32c2cf5a245420b645b9b3f05446ef42bb",
+      "d6676c21c82ac6f840aa979aefb5946f86dcf4e4",
+      "c3bf4028200a139d8c3ed3d8da4c3769a1bcaa78",
+      "e71fb7806116545b220f0d3a3490185de9c4bb18",
+      "9e77efbf6d5bb6465c24b6266a31d9c15d519e10",
+      "2006f7e78745e6c408b6d3ce94dee98073f1bf4d",
+      "2448df36d4ad42d37041422e29d5e60408f3c42e",
+      "ca9d808850519605fe26710386ff59a1b586461c"
+    ],
+    "witness": [
+      "5535c24a10ee694ee1ec2741f71014c5fa401510",
+      "",
+      "ac78f975031c23257cdcb3804b18e68254506f8e",
+      "",
+      "ebf6b21ac31254cfe179ff60abdbf3656b33d6d0",
+      "",
+      "07e2aae7e41f57c7c448bc2ac083918b6e2fbf33",
+      "",
+      "b0ea9ad7ff0a139914673aa1c46ea0c02041a65b",
+      "",
+      "1d9048256c2c666b8055412450045fc00549e15c",
+      "",
+      "58f1cbc5f2d1e22d5baa2d37569741d68146778a",
+      "",
+      "8755d35d5aef123498b22e15f0456ed0dd3f8702",
+      "",
+      "2bf3bb94607687ffedd000477feb22613dd6ef8d",
+      "07",
+      "7f8a6e1aff2d2402d2356d1b4cdfa77f7c6f9ca8",
+      "08"
+    ],
+    "signature": [
+      "5535c24a10ee694ee1ec2741f71014c5fa40151000",
+      "ac78f975031c23257cdcb3804b18e68254506f8e00",
+      "ebf6b21ac31254cfe179ff60abdbf3656b33d6d000",
+      "07e2aae7e41f57c7c448bc2ac083918b6e2fbf3300",
+      "b0ea9ad7ff0a139914673aa1c46ea0c02041a65b00",
+      "1d9048256c2c666b8055412450045fc00549e15c00",
+      "58f1cbc5f2d1e22d5baa2d37569741d68146778a00",
+      "8755d35d5aef123498b22e15f0456ed0dd3f870200",
+      "2bf3bb94607687ffedd000477feb22613dd6ef8d07",
+      "7f8a6e1aff2d2402d2356d1b4cdfa77f7c6f9ca808"
+    ],
+    "compact_witness": [
+      "5535c24a10ee694ee1ec2741f71014c5fa401510",
+      "ac78f975031c23257cdcb3804b18e68254506f8e",
+      "ebf6b21ac31254cfe179ff60abdbf3656b33d6d0",
+      "07e2aae7e41f57c7c448bc2ac083918b6e2fbf33",
+      "b0ea9ad7ff0a139914673aa1c46ea0c02041a65b",
+      "1d9048256c2c666b8055412450045fc00549e15c",
+      "58f1cbc5f2d1e22d5baa2d37569741d68146778a",
+      "8755d35d5aef123498b22e15f0456ed0dd3f8702",
+      "2bf3bb94607687ffedd000477feb22613dd6ef8d",
+      "7f8a6e1aff2d2402d2356d1b4cdfa77f7c6f9ca8"
+    ],
+    "compact_signature": [
+      "5535c24a10ee694ee1ec2741f71014c5fa401510",
+      "ac78f975031c23257cdcb3804b18e68254506f8e",
+      "ebf6b21ac31254cfe179ff60abdbf3656b33d6d0",
+      "07e2aae7e41f57c7c448bc2ac083918b6e2fbf33",
+      "b0ea9ad7ff0a139914673aa1c46ea0c02041a65b",
+      "1d9048256c2c666b8055412450045fc00549e15c",
+      "58f1cbc5f2d1e22d5baa2d37569741d68146778a",
+      "8755d35d5aef123498b22e15f0456ed0dd3f8702",
+      "2bf3bb94607687ffedd000477feb22613dd6ef8d",
+      "7f8a6e1aff2d2402d2356d1b4cdfa77f7c6f9ca8"
+    ]
+  },
+  {
+    "message": "00000000",
+    "secretKey": "1b27abe5385ba5da8fb57cf3333216950343587a",
+    "publicKey": [
+      "10a332844d083aecd5b356e6c5579aa27d349fb4",
+      "230496bb65f3613c8babb6f493276bd6cb7432d9",
+      "ce3145470e3fb88882b91abf61b78526f030682e",
+      "af37a596df8a2b50adc75c5b8f6e727b35ea4b57",
+      "f6187329f0786d27a97ffd84ffd9aef0512711cf",
+      "ff3296d5b1f15964f3e5c2bdc906125c16103956",
+      "b6bdb6f40dc431f7f98b1fd6da28dcefc002e857",
+      "3fc9421f6e7ec3a54b236ee93ce33fc769a50e6c",
+      "9dd03639bdf6a1919775e7fad6f93dce67224d06",
+      "370d42ffaa4507f69931d5e55eb4ade05a4bba5b"
+    ],
+    "witness": [
+      "916787898028fa0b2fe4f9b54be1e686664e187e",
+      "",
+      "cceaa3a51ad4618c075542781d6fba4709ad8be9",
+      "",
+      "64b64def84e6e28b8091ef82774189f77b173f00",
+      "",
+      "58e22c23705b90f0f130fb54c8511841a56daab0",
+      "",
+      "59528ad26524a0a696685d8940b65a910dcec4ea",
+      "",
+      "47eac1fd91aa04f0454bc4f128ef886eb5bbd0c4",
+      "",
+      "5d200cbf2110bd6e2488a739db33aea39d72982c",
+      "",
+      "3a935276a843c0b9b383f737fba48e632af6b245",
+      "",
+      "9642649955dba18f9749b5626b3dc856f63bb98c",
+      "07",
+      "8ccfab456a763fac3dc65443e3b2aa2f8c3d5585",
+      "08"
+    ],
+    "signature": [
+      "916787898028fa0b2fe4f9b54be1e686664e187e00",
+      "cceaa3a51ad4618c075542781d6fba4709ad8be900",
+      "64b64def84e6e28b8091ef82774189f77b173f0000",
+      "58e22c23705b90f0f130fb54c8511841a56daab000",
+      "59528ad26524a0a696685d8940b65a910dcec4ea00",
+      "47eac1fd91aa04f0454bc4f128ef886eb5bbd0c400",
+      "5d200cbf2110bd6e2488a739db33aea39d72982c00",
+      "3a935276a843c0b9b383f737fba48e632af6b24500",
+      "9642649955dba18f9749b5626b3dc856f63bb98c07",
+      "8ccfab456a763fac3dc65443e3b2aa2f8c3d558508"
+    ],
+    "compact_witness": [
+      "916787898028fa0b2fe4f9b54be1e686664e187e",
+      "cceaa3a51ad4618c075542781d6fba4709ad8be9",
+      "64b64def84e6e28b8091ef82774189f77b173f00",
+      "58e22c23705b90f0f130fb54c8511841a56daab0",
+      "59528ad26524a0a696685d8940b65a910dcec4ea",
+      "47eac1fd91aa04f0454bc4f128ef886eb5bbd0c4",
+      "5d200cbf2110bd6e2488a739db33aea39d72982c",
+      "3a935276a843c0b9b383f737fba48e632af6b245",
+      "9642649955dba18f9749b5626b3dc856f63bb98c",
+      "8ccfab456a763fac3dc65443e3b2aa2f8c3d5585"
+    ],
+    "compact_signature": [
+      "916787898028fa0b2fe4f9b54be1e686664e187e",
+      "cceaa3a51ad4618c075542781d6fba4709ad8be9",
+      "64b64def84e6e28b8091ef82774189f77b173f00",
+      "58e22c23705b90f0f130fb54c8511841a56daab0",
+      "59528ad26524a0a696685d8940b65a910dcec4ea",
+      "47eac1fd91aa04f0454bc4f128ef886eb5bbd0c4",
+      "5d200cbf2110bd6e2488a739db33aea39d72982c",
+      "3a935276a843c0b9b383f737fba48e632af6b245",
+      "9642649955dba18f9749b5626b3dc856f63bb98c",
+      "8ccfab456a763fac3dc65443e3b2aa2f8c3d5585"
+    ]
+  },
+  {
+    "message": "00000000",
+    "secretKey": "5e56e3e6e4d943278b4cfc612958e141a837cec3",
+    "publicKey": [
+      "d9a88413f44990b41d1790b087760dd054a49eaf",
+      "edf5d5fce96b8ba8ba28f6a2b80e8025cb2e13b8",
+      "6341e603f9ef1de492c3fee72cb0aafa1c5b6ecf",
+      "86d3fc7ab8804850e1a48dd57c4ac5b80a580b9b",
+      "72b90e3c7ca639b03c300d6e8ccf77e70fb56279",
+      "06407543404dd577734ae53e3512c3087fb23664",
+      "d9a909e4310e9e50ea2e4eac9e185918d089ab91",
+      "734e8d7fcaa358a2b61b12957105830e13f16585",
+      "a9fb28395f2536907717c774fcbd7a5109fe1677",
+      "15e11eb44361b5e406d87a37f7eeb36b199ae3fa"
+    ],
+    "witness": [
+      "71ef79efd7d94dcc04d5bfe829f0baaf66a2646e",
+      "",
+      "492550e15b4a0c807df5e3ae5e8962f89d519d8e",
+      "",
+      "c86fced99c14c0359e8859c694793ca062ba7eac",
+      "",
+      "368127b56bfa918556db1dbfcc94e52f0816586b",
+      "",
+      "d1bf0649d40f391373757a09a7c140fd08b4df31",
+      "",
+      "0312532ec4aef669efe10454f8ff8acf7f56fbba",
+      "",
+      "300b0d6a0fc84c24b46ec0d1d37cea1fdcc67514",
+      "",
+      "f29dac51eb6c3df76089e2f56e5ed0db0608a2b6",
+      "",
+      "0d87aa82f884ccbf725b450156ed7cbf703423ca",
+      "07",
+      "008770152bc457fd55ae90ec12e31f9eed26f327",
+      "08"
+    ],
+    "signature": [
+      "71ef79efd7d94dcc04d5bfe829f0baaf66a2646e00",
+      "492550e15b4a0c807df5e3ae5e8962f89d519d8e00",
+      "c86fced99c14c0359e8859c694793ca062ba7eac00",
+      "368127b56bfa918556db1dbfcc94e52f0816586b00",
+      "d1bf0649d40f391373757a09a7c140fd08b4df3100",
+      "0312532ec4aef669efe10454f8ff8acf7f56fbba00",
+      "300b0d6a0fc84c24b46ec0d1d37cea1fdcc6751400",
+      "f29dac51eb6c3df76089e2f56e5ed0db0608a2b600",
+      "0d87aa82f884ccbf725b450156ed7cbf703423ca07",
+      "008770152bc457fd55ae90ec12e31f9eed26f32708"
+    ],
+    "compact_witness": [
+      "71ef79efd7d94dcc04d5bfe829f0baaf66a2646e",
+      "492550e15b4a0c807df5e3ae5e8962f89d519d8e",
+      "c86fced99c14c0359e8859c694793ca062ba7eac",
+      "368127b56bfa918556db1dbfcc94e52f0816586b",
+      "d1bf0649d40f391373757a09a7c140fd08b4df31",
+      "0312532ec4aef669efe10454f8ff8acf7f56fbba",
+      "300b0d6a0fc84c24b46ec0d1d37cea1fdcc67514",
+      "f29dac51eb6c3df76089e2f56e5ed0db0608a2b6",
+      "0d87aa82f884ccbf725b450156ed7cbf703423ca",
+      "008770152bc457fd55ae90ec12e31f9eed26f327"
+    ],
+    "compact_signature": [
+      "71ef79efd7d94dcc04d5bfe829f0baaf66a2646e",
+      "492550e15b4a0c807df5e3ae5e8962f89d519d8e",
+      "c86fced99c14c0359e8859c694793ca062ba7eac",
+      "368127b56bfa918556db1dbfcc94e52f0816586b",
+      "d1bf0649d40f391373757a09a7c140fd08b4df31",
+      "0312532ec4aef669efe10454f8ff8acf7f56fbba",
+      "300b0d6a0fc84c24b46ec0d1d37cea1fdcc67514",
+      "f29dac51eb6c3df76089e2f56e5ed0db0608a2b6",
+      "0d87aa82f884ccbf725b450156ed7cbf703423ca",
+      "008770152bc457fd55ae90ec12e31f9eed26f327"
+    ]
+  },
+  {
+    "message": "ffffffff",
+    "secretKey": "2f9b86fcb6cc9cdb25932343f7c6520521270a42",
+    "publicKey": [
+      "cc138e3ed809655b6d55e5233bb7e0d12697cc93",
+      "3b0db01d533291f9cedcced9e481a2a24a64f80e",
+      "5b0ece3c1301958f95b9eb4d872d705fe49fd6ab",
+      "dd14d3a88ba842d00ab7456044cf530639442a59",
+      "d60623444fb36969860ce8868744e0fd76b5e39c",
+      "10194a2036de577b3093cb5d1094ac55bbc3ab4d",
+      "526fa030c15d1681938d9fb2acd4d9a4d54f4bab",
+      "398078f7801794cfd6fdd51ab25790b68ada008f",
+      "84980f50de6ef35ed52121e431df79933ac30f16",
+      "62dfe305e5dd1d282b0c90e74e9860a512bf0f97"
+    ],
+    "witness": [
+      "cc138e3ed809655b6d55e5233bb7e0d12697cc93",
+      "0f",
+      "3b0db01d533291f9cedcced9e481a2a24a64f80e",
+      "0f",
+      "5b0ece3c1301958f95b9eb4d872d705fe49fd6ab",
+      "0f",
+      "dd14d3a88ba842d00ab7456044cf530639442a59",
+      "0f",
+      "d60623444fb36969860ce8868744e0fd76b5e39c",
+      "0f",
+      "10194a2036de577b3093cb5d1094ac55bbc3ab4d",
+      "0f",
+      "526fa030c15d1681938d9fb2acd4d9a4d54f4bab",
+      "0f",
+      "398078f7801794cfd6fdd51ab25790b68ada008f",
+      "0f",
+      "2771ef4ce2542e826fb41da14694fe7b7c3a4786",
+      "",
+      "2ceb4d0e51964b0c6272c9777eeab9ea50e8df76",
+      ""
+    ],
+    "signature": [
+      "cc138e3ed809655b6d55e5233bb7e0d12697cc930f",
+      "3b0db01d533291f9cedcced9e481a2a24a64f80e0f",
+      "5b0ece3c1301958f95b9eb4d872d705fe49fd6ab0f",
+      "dd14d3a88ba842d00ab7456044cf530639442a590f",
+      "d60623444fb36969860ce8868744e0fd76b5e39c0f",
+      "10194a2036de577b3093cb5d1094ac55bbc3ab4d0f",
+      "526fa030c15d1681938d9fb2acd4d9a4d54f4bab0f",
+      "398078f7801794cfd6fdd51ab25790b68ada008f0f",
+      "2771ef4ce2542e826fb41da14694fe7b7c3a478600",
+      "2ceb4d0e51964b0c6272c9777eeab9ea50e8df7600"
+    ],
+    "compact_witness": [
+      "cc138e3ed809655b6d55e5233bb7e0d12697cc93",
+      "3b0db01d533291f9cedcced9e481a2a24a64f80e",
+      "5b0ece3c1301958f95b9eb4d872d705fe49fd6ab",
+      "dd14d3a88ba842d00ab7456044cf530639442a59",
+      "d60623444fb36969860ce8868744e0fd76b5e39c",
+      "10194a2036de577b3093cb5d1094ac55bbc3ab4d",
+      "526fa030c15d1681938d9fb2acd4d9a4d54f4bab",
+      "398078f7801794cfd6fdd51ab25790b68ada008f",
+      "2771ef4ce2542e826fb41da14694fe7b7c3a4786",
+      "2ceb4d0e51964b0c6272c9777eeab9ea50e8df76"
+    ],
+    "compact_signature": [
+      "cc138e3ed809655b6d55e5233bb7e0d12697cc93",
+      "3b0db01d533291f9cedcced9e481a2a24a64f80e",
+      "5b0ece3c1301958f95b9eb4d872d705fe49fd6ab",
+      "dd14d3a88ba842d00ab7456044cf530639442a59",
+      "d60623444fb36969860ce8868744e0fd76b5e39c",
+      "10194a2036de577b3093cb5d1094ac55bbc3ab4d",
+      "526fa030c15d1681938d9fb2acd4d9a4d54f4bab",
+      "398078f7801794cfd6fdd51ab25790b68ada008f",
+      "2771ef4ce2542e826fb41da14694fe7b7c3a4786",
+      "2ceb4d0e51964b0c6272c9777eeab9ea50e8df76"
+    ]
+  },
+  {
+    "message": "0416e38a",
+    "secretKey": "1b28fe856f5cdb329c192af2b262de291f1492b7",
+    "publicKey": [
+      "83c57a129a0cab58decc799cc36c818dd030252f",
+      "41e2ed6d9c66e3d497c0d7f5de1666e6e4215fc3",
+      "e5a66fc7f6668b5ac06cdb157bf4324ac5508062",
+      "54da96596de257e98efa4d06b59fcd0c4700d74c",
+      "503cda436f4c962acf8d60f8ff4495c935dd1b6e",
+      "8eb535f8a78182bfbae172b7fad6bfa37e2eb023",
+      "a9b665e590919192c7fc779ae1fa079241306545",
+      "f9aa7312874ce6cadb73cdc61c8836f5b482a691",
+      "27b7dc8859bff78759a483c2570054a32c849df8",
+      "df115b9dbc76f3e7830d52fe3123a30f1f76b544"
+    ],
+    "witness": [
+      "ab2efb0a2d6d3f547709d3ca15054b49336218bf",
+      "08",
+      "5019be258dccd33ed62a73097d56f13434fda1bc",
+      "0a",
+      "d9990d2c1c82717f532a0439230a80e914ee365b",
+      "0e",
+      "1fb70f529c17131c876149ad0a7ca06bd9c77155",
+      "03",
+      "3f48bed9fc99b6b11130bfb2009cfceee387e131",
+      "01",
+      "4808b8aae2341c1ac6d2b76a66f7ec0a50a8a744",
+      "06",
+      "6fe99fcd9ffa861b1f5933c6f22300cd47bb34d7",
+      "",
+      "53867c4d784ddc2acc8f3f4ea6d663b88d2139b8",
+      "04",
+      "09614988507fb9a4b01e2864ab123c2c470db2c2",
+      "04",
+      "903dd6053fbf6a4afc312212096a58dd5179f2ba",
+      "0a"
+    ],
+    "signature": [
+      "ab2efb0a2d6d3f547709d3ca15054b49336218bf08",
+      "5019be258dccd33ed62a73097d56f13434fda1bc0a",
+      "d9990d2c1c82717f532a0439230a80e914ee365b0e",
+      "1fb70f529c17131c876149ad0a7ca06bd9c7715503",
+      "3f48bed9fc99b6b11130bfb2009cfceee387e13101",
+      "4808b8aae2341c1ac6d2b76a66f7ec0a50a8a74406",
+      "6fe99fcd9ffa861b1f5933c6f22300cd47bb34d700",
+      "53867c4d784ddc2acc8f3f4ea6d663b88d2139b804",
+      "09614988507fb9a4b01e2864ab123c2c470db2c204",
+      "903dd6053fbf6a4afc312212096a58dd5179f2ba0a"
+    ],
+    "compact_witness": [
+      "ab2efb0a2d6d3f547709d3ca15054b49336218bf",
+      "5019be258dccd33ed62a73097d56f13434fda1bc",
+      "d9990d2c1c82717f532a0439230a80e914ee365b",
+      "1fb70f529c17131c876149ad0a7ca06bd9c77155",
+      "3f48bed9fc99b6b11130bfb2009cfceee387e131",
+      "4808b8aae2341c1ac6d2b76a66f7ec0a50a8a744",
+      "6fe99fcd9ffa861b1f5933c6f22300cd47bb34d7",
+      "53867c4d784ddc2acc8f3f4ea6d663b88d2139b8",
+      "09614988507fb9a4b01e2864ab123c2c470db2c2",
+      "903dd6053fbf6a4afc312212096a58dd5179f2ba"
+    ],
+    "compact_signature": [
+      "ab2efb0a2d6d3f547709d3ca15054b49336218bf",
+      "5019be258dccd33ed62a73097d56f13434fda1bc",
+      "d9990d2c1c82717f532a0439230a80e914ee365b",
+      "1fb70f529c17131c876149ad0a7ca06bd9c77155",
+      "3f48bed9fc99b6b11130bfb2009cfceee387e131",
+      "4808b8aae2341c1ac6d2b76a66f7ec0a50a8a744",
+      "6fe99fcd9ffa861b1f5933c6f22300cd47bb34d7",
+      "53867c4d784ddc2acc8f3f4ea6d663b88d2139b8",
+      "09614988507fb9a4b01e2864ab123c2c470db2c2",
+      "903dd6053fbf6a4afc312212096a58dd5179f2ba"
+    ]
+  },
+  {
+    "message": "0000ffff",
+    "secretKey": "7e6882fddc781fa6943a2b3b5663f22dff37ba98",
+    "publicKey": [
+      "e39add35df9c24e6eb7ce7392901a91cd804d1a2",
+      "0cc37c84a21001ac56ff5b0e501ff3c030bb9dac",
+      "91a17081e7748382e987fb701e67944cf77a6725",
+      "481b432706f251fefb7beb38ce3d4a85ef124c6d",
+      "a09f0dc5088da66faf4a71ef686db7097afea333",
+      "15cf0f657e51c70a7764a56b90cc232be0623708",
+      "efd9f8abd91dc4764f430440bfd2e9fc85016a28",
+      "dc0d6597bc9bfc0beaba2633697bd660938c158a",
+      "62c926211552e2ab03fd31d96429415d1e1b114b",
+      "6d7d7d43ee58e690131bffffe8d9a04775acf866"
+    ],
+    "witness": [
+      "e39add35df9c24e6eb7ce7392901a91cd804d1a2",
+      "0f",
+      "0cc37c84a21001ac56ff5b0e501ff3c030bb9dac",
+      "0f",
+      "91a17081e7748382e987fb701e67944cf77a6725",
+      "0f",
+      "481b432706f251fefb7beb38ce3d4a85ef124c6d",
+      "0f",
+      "e8dfce8f6154dc9770536c39c5af4f7c9e047246",
+      "",
+      "94f54f9b5ff1312a8577d1ecaea2fb6cb3e03eb9",
+      "",
+      "56883c447cb469b70306b340fc50838beb1236b3",
+      "",
+      "21dffff8dad6196990db646e336a9308153d79a8",
+      "",
+      "9de92de44a3fad560f2b8672c9742f658fd413e8",
+      "03",
+      "bb9aeb454331909590a99defad2425f058810b91",
+      "0c"
+    ],
+    "signature": [
+      "e39add35df9c24e6eb7ce7392901a91cd804d1a20f",
+      "0cc37c84a21001ac56ff5b0e501ff3c030bb9dac0f",
+      "91a17081e7748382e987fb701e67944cf77a67250f",
+      "481b432706f251fefb7beb38ce3d4a85ef124c6d0f",
+      "e8dfce8f6154dc9770536c39c5af4f7c9e04724600",
+      "94f54f9b5ff1312a8577d1ecaea2fb6cb3e03eb900",
+      "56883c447cb469b70306b340fc50838beb1236b300",
+      "21dffff8dad6196990db646e336a9308153d79a800",
+      "9de92de44a3fad560f2b8672c9742f658fd413e803",
+      "bb9aeb454331909590a99defad2425f058810b910c"
+    ],
+    "compact_witness": [
+      "e39add35df9c24e6eb7ce7392901a91cd804d1a2",
+      "0cc37c84a21001ac56ff5b0e501ff3c030bb9dac",
+      "91a17081e7748382e987fb701e67944cf77a6725",
+      "481b432706f251fefb7beb38ce3d4a85ef124c6d",
+      "e8dfce8f6154dc9770536c39c5af4f7c9e047246",
+      "94f54f9b5ff1312a8577d1ecaea2fb6cb3e03eb9",
+      "56883c447cb469b70306b340fc50838beb1236b3",
+      "21dffff8dad6196990db646e336a9308153d79a8",
+      "9de92de44a3fad560f2b8672c9742f658fd413e8",
+      "bb9aeb454331909590a99defad2425f058810b91"
+    ],
+    "compact_signature": [
+      "e39add35df9c24e6eb7ce7392901a91cd804d1a2",
+      "0cc37c84a21001ac56ff5b0e501ff3c030bb9dac",
+      "91a17081e7748382e987fb701e67944cf77a6725",
+      "481b432706f251fefb7beb38ce3d4a85ef124c6d",
+      "e8dfce8f6154dc9770536c39c5af4f7c9e047246",
+      "94f54f9b5ff1312a8577d1ecaea2fb6cb3e03eb9",
+      "56883c447cb469b70306b340fc50838beb1236b3",
+      "21dffff8dad6196990db646e336a9308153d79a8",
+      "9de92de44a3fad560f2b8672c9742f658fd413e8",
+      "bb9aeb454331909590a99defad2425f058810b91"
+    ]
+  },
+  {
+    "message": "00ff3fc7",
+    "secretKey": "a1bbbb840c1d8763d81b5de8472528991248ab32",
+    "publicKey": [
+      "259f7adb467f4d9499483b0310f796213a04f65b",
+      "4253a87069d616d1b19d650064e15c0130a51478",
+      "6bb3183b0e93eeb281707569312c91cc77bc8ef1",
+      "a4ee66b41c8a88493e7381e22ebf1efc73f8d7e0",
+      "1a70e87456cae6acf8f72dc8c8fe06a575ba5303",
+      "6dba6bca5887218069a9e8e9e4dde1b2e37d3f6f",
+      "0950acf1684b4465237cc54700227c5f20369464",
+      "1489c0ca9183f195b88d6a3e1195d5140532cdfc",
+      "621782337435eed28ba8e424e2d667670cdb8081",
+      "80538aeb40f79bcf83f6096ea50b6f1b32f06aac"
+    ],
+    "witness": [
+      "f2d8517c438ca4d326954f823564535c968f2989",
+      "0c",
+      "1f8808dde2a9a6b4a9ec49d8837568abb8a419e8",
+      "07",
+      "e6ff44ef104934317649762556411547f082ed11",
+      "03",
+      "a4ee66b41c8a88493e7381e22ebf1efc73f8d7e0",
+      "0f",
+      "1a70e87456cae6acf8f72dc8c8fe06a575ba5303",
+      "0f",
+      "6dba6bca5887218069a9e8e9e4dde1b2e37d3f6f",
+      "0f",
+      "8238d2fa39e97d10ef86390bb29e2f89f01c136d",
+      "",
+      "99792be34a0b4428db5985c99614f948b85675c2",
+      "",
+      "529b6cccd96f8733b0e9a6c958ce7fa95d14be44",
+      "03",
+      "86a90afcf9c31218f383e74a3bf877dc6f8b5885",
+      "05"
+    ],
+    "signature": [
+      "f2d8517c438ca4d326954f823564535c968f29890c",
+      "1f8808dde2a9a6b4a9ec49d8837568abb8a419e807",
+      "e6ff44ef104934317649762556411547f082ed1103",
+      "a4ee66b41c8a88493e7381e22ebf1efc73f8d7e00f",
+      "1a70e87456cae6acf8f72dc8c8fe06a575ba53030f",
+      "6dba6bca5887218069a9e8e9e4dde1b2e37d3f6f0f",
+      "8238d2fa39e97d10ef86390bb29e2f89f01c136d00",
+      "99792be34a0b4428db5985c99614f948b85675c200",
+      "529b6cccd96f8733b0e9a6c958ce7fa95d14be4403",
+      "86a90afcf9c31218f383e74a3bf877dc6f8b588505"
+    ],
+    "compact_witness": [
+      "f2d8517c438ca4d326954f823564535c968f2989",
+      "1f8808dde2a9a6b4a9ec49d8837568abb8a419e8",
+      "e6ff44ef104934317649762556411547f082ed11",
+      "a4ee66b41c8a88493e7381e22ebf1efc73f8d7e0",
+      "1a70e87456cae6acf8f72dc8c8fe06a575ba5303",
+      "6dba6bca5887218069a9e8e9e4dde1b2e37d3f6f",
+      "8238d2fa39e97d10ef86390bb29e2f89f01c136d",
+      "99792be34a0b4428db5985c99614f948b85675c2",
+      "529b6cccd96f8733b0e9a6c958ce7fa95d14be44",
+      "86a90afcf9c31218f383e74a3bf877dc6f8b5885"
+    ],
+    "compact_signature": [
+      "f2d8517c438ca4d326954f823564535c968f2989",
+      "1f8808dde2a9a6b4a9ec49d8837568abb8a419e8",
+      "e6ff44ef104934317649762556411547f082ed11",
+      "a4ee66b41c8a88493e7381e22ebf1efc73f8d7e0",
+      "1a70e87456cae6acf8f72dc8c8fe06a575ba5303",
+      "6dba6bca5887218069a9e8e9e4dde1b2e37d3f6f",
+      "8238d2fa39e97d10ef86390bb29e2f89f01c136d",
+      "99792be34a0b4428db5985c99614f948b85675c2",
+      "529b6cccd96f8733b0e9a6c958ce7fa95d14be44",
+      "86a90afcf9c31218f383e74a3bf877dc6f8b5885"
+    ]
+  },
+  {
+    "message": "00000000000000000000000000000000",
+    "secretKey": "658497fbaac98c4bde221a75fae2ea19e3b79b45",
+    "publicKey": [
+      "0278974449a108f78b2a3cbe2726ca63bed4bcd2",
+      "20798749569f50b0a434cfd1fdfc5bea9c158f61",
+      "dce78c3e9b14b6b8a3b675f62b3d59da6e2f501f",
+      "87716bc13e1c3be266ba2807c64a9c0bc561260c",
+      "4a711935450146f38fd2871ab3bb4aeb7ed4db5d",
+      "28a7c48e641981a9d873592da390982c49ad5553",
+      "0b68628f5f8b672c247f760b7333177cbef09268",
+      "19620fb1b021c23b59394cfd73e77392145e2355",
+      "d1d4709a25b94955444e1b318a8f615f8a0d0173",
+      "09f4fd3579a49008fde67bebeb15819f8c4ff3e2",
+      "c8d8ad5c9153c0630bdb07906e5b02844b01fdac",
+      "8691811a67388f4d26a20b9f627fcd7a15a4a6b6",
+      "cd7da974c81f988ea9f227ae6126ac8e5f0bed66",
+      "89663f68895310b6914af12da26ea6085c714229",
+      "abb4ccc318b846ac569a4efd0a7e25afc30503b0",
+      "d33469d51ec7d914751f5d8f62e201d261bb8a0c",
+      "6fa96ebe74fc729515faceee140878a9a9f1f541",
+      "f127d52d9b82747fd92e4bbbbff268f2a033accb",
+      "c8d92d0aa4dfc6affe98a71d3972fd28ca48de4a",
+      "f3753c7d07680cf9fffb49771763dd33844c544f",
+      "ae28f10ae9c40b2c7d847241897c63106ffe21af",
+      "f885f97f11fb3cab6a8b77b38c631f6eec90843a",
+      "50ef3ca0151d1edce366b564cfbdc5b092dd292a",
+      "bb37bf4a7a0bd56a32d290c3898f53a88398c3ff",
+      "99c0db4477a7f761122705503b6e46ae4c2be356",
+      "769e62b41ee03861d5811515630809f40a055fa0",
+      "b775076a730a9505010663d6432e53666768145b",
+      "739168233cf7c02de64e66944e657c1f34e58fe9",
+      "0518bfdd47fb2a77691b9205b266ef9c2d817260",
+      "e0802ba02c082dad6457dcbbe05cc1abf34a4ed1",
+      "b5de66855643fb3d69ef5fa34d229cae0aa8de2b",
+      "09fd97fadc6f4481430e415b091a651c9fa8c0bb",
+      "12ab881fe0d96ed1c861e25fba011bb1924ab39a",
+      "a803ebf411a52c8dc27cd07e07f891d07a3f8803",
+      "1ebd59e9e6666ae526d1bd47e85ca1f271effb3e"
+    ],
+    "witness": [
+      "c8bef43210f8dd770996421f168b0dc0d8c7562c",
+      "",
+      "8d9a7ba8051ea82be534eedd8d24645cf0d9c950",
+      "",
+      "88a465f5acc4c61586c53c34c3fb86369bf13d5b",
+      "",
+      "9a6c069d163479b4fb0391dbb717326a03309fed",
+      "",
+      "99d26816e536a5511fce59efebcfee8fe336ca99",
+      "",
+      "38574a5bcb1e26b94e5cd55e9f79ef67dfd1c927",
+      "",
+      "b3cb8c6a78c2aa7b70d36c5b686bedcf53fab709",
+      "",
+      "40e905ba19a0c6c0159a46142d44b9c4cf716613",
+      "",
+      "c3bf9c9669b765a5851c4c0a9863bf7c7bea3782",
+      "",
+      "7df383f364c5898239308405a9fd19e19df8eead",
+      "",
+      "574f2225ce7e914514281a370a07cb55c9d9271b",
+      "",
+      "e6dd87a7a7402b8ce960d160128c2f23509d73ff",
+      "",
+      "f384a6eb7abad0f125286269d7f483450f1dcf7e",
+      "",
+      "af7466e933bdb740b2e4e61bb9a1448012f43d2e",
+      "",
+      "bc68ab0432de58c61b944cfc86a9e69c7fbcc308",
+      "",
+      "c3573e342da0e56dcff59a0be3afbf8433d566d6",
+      "",
+      "a8c6916f27662356cfe1d382038d3159834ce41c",
+      "",
+      "e18d95e7bdd0b1cfcdea31a84b704f66ddb26932",
+      "",
+      "d5ef90dcb247830956fbb822d3588b7b816a7bd1",
+      "",
+      "bbce9530ac66e3b1c363346fe1a143f6c6147122",
+      "",
+      "44d3502426811537e04f254ed27d8821891b2804",
+      "",
+      "2fb016107cddb6d414b13da0c9f552778396523e",
+      "",
+      "55313b2f145a21e5a9bfd9d1532a752cb92f93e7",
+      "",
+      "449445ba6a6582e15294940d6444fa4eba4c0aa6",
+      "",
+      "418acdbe8f52b2ec72273a29831fd4c6faef3831",
+      "",
+      "59b28b13cecd86530a3351e7e1e8f4715dc12422",
+      "",
+      "c81726edc503234496657245f3b717e46bef6193",
+      "",
+      "cde621bf416a3ebaf18317f66696101578dd5047",
+      "",
+      "3d2d808390cab75380443cd5de770a4d698a04eb",
+      "",
+      "df88883d00aa84987ec7c51a174e60fbd7883cc0",
+      "",
+      "760c64954f2ad56be2b085b0dd883dd3fe120793",
+      "",
+      "829219985c33dbc65884163c90ce34838b13b39a",
+      "",
+      "673941de95c89419b30c6872d03350ddf266da59",
+      "01",
+      "acd51cd687662fdfb7983708fb2a110598836b33",
+      "0e",
+      "18e5beb737fe6e42542915863dfd8bf71496c56a",
+      ""
+    ],
+    "signature": [
+      "c8bef43210f8dd770996421f168b0dc0d8c7562c00",
+      "8d9a7ba8051ea82be534eedd8d24645cf0d9c95000",
+      "88a465f5acc4c61586c53c34c3fb86369bf13d5b00",
+      "9a6c069d163479b4fb0391dbb717326a03309fed00",
+      "99d26816e536a5511fce59efebcfee8fe336ca9900",
+      "38574a5bcb1e26b94e5cd55e9f79ef67dfd1c92700",
+      "b3cb8c6a78c2aa7b70d36c5b686bedcf53fab70900",
+      "40e905ba19a0c6c0159a46142d44b9c4cf71661300",
+      "c3bf9c9669b765a5851c4c0a9863bf7c7bea378200",
+      "7df383f364c5898239308405a9fd19e19df8eead00",
+      "574f2225ce7e914514281a370a07cb55c9d9271b00",
+      "e6dd87a7a7402b8ce960d160128c2f23509d73ff00",
+      "f384a6eb7abad0f125286269d7f483450f1dcf7e00",
+      "af7466e933bdb740b2e4e61bb9a1448012f43d2e00",
+      "bc68ab0432de58c61b944cfc86a9e69c7fbcc30800",
+      "c3573e342da0e56dcff59a0be3afbf8433d566d600",
+      "a8c6916f27662356cfe1d382038d3159834ce41c00",
+      "e18d95e7bdd0b1cfcdea31a84b704f66ddb2693200",
+      "d5ef90dcb247830956fbb822d3588b7b816a7bd100",
+      "bbce9530ac66e3b1c363346fe1a143f6c614712200",
+      "44d3502426811537e04f254ed27d8821891b280400",
+      "2fb016107cddb6d414b13da0c9f552778396523e00",
+      "55313b2f145a21e5a9bfd9d1532a752cb92f93e700",
+      "449445ba6a6582e15294940d6444fa4eba4c0aa600",
+      "418acdbe8f52b2ec72273a29831fd4c6faef383100",
+      "59b28b13cecd86530a3351e7e1e8f4715dc1242200",
+      "c81726edc503234496657245f3b717e46bef619300",
+      "cde621bf416a3ebaf18317f66696101578dd504700",
+      "3d2d808390cab75380443cd5de770a4d698a04eb00",
+      "df88883d00aa84987ec7c51a174e60fbd7883cc000",
+      "760c64954f2ad56be2b085b0dd883dd3fe12079300",
+      "829219985c33dbc65884163c90ce34838b13b39a00",
+      "673941de95c89419b30c6872d03350ddf266da5901",
+      "acd51cd687662fdfb7983708fb2a110598836b330e",
+      "18e5beb737fe6e42542915863dfd8bf71496c56a00"
+    ],
+    "compact_witness": [
+      "c8bef43210f8dd770996421f168b0dc0d8c7562c",
+      "8d9a7ba8051ea82be534eedd8d24645cf0d9c950",
+      "88a465f5acc4c61586c53c34c3fb86369bf13d5b",
+      "9a6c069d163479b4fb0391dbb717326a03309fed",
+      "99d26816e536a5511fce59efebcfee8fe336ca99",
+      "38574a5bcb1e26b94e5cd55e9f79ef67dfd1c927",
+      "b3cb8c6a78c2aa7b70d36c5b686bedcf53fab709",
+      "40e905ba19a0c6c0159a46142d44b9c4cf716613",
+      "c3bf9c9669b765a5851c4c0a9863bf7c7bea3782",
+      "7df383f364c5898239308405a9fd19e19df8eead",
+      "574f2225ce7e914514281a370a07cb55c9d9271b",
+      "e6dd87a7a7402b8ce960d160128c2f23509d73ff",
+      "f384a6eb7abad0f125286269d7f483450f1dcf7e",
+      "af7466e933bdb740b2e4e61bb9a1448012f43d2e",
+      "bc68ab0432de58c61b944cfc86a9e69c7fbcc308",
+      "c3573e342da0e56dcff59a0be3afbf8433d566d6",
+      "a8c6916f27662356cfe1d382038d3159834ce41c",
+      "e18d95e7bdd0b1cfcdea31a84b704f66ddb26932",
+      "d5ef90dcb247830956fbb822d3588b7b816a7bd1",
+      "bbce9530ac66e3b1c363346fe1a143f6c6147122",
+      "44d3502426811537e04f254ed27d8821891b2804",
+      "2fb016107cddb6d414b13da0c9f552778396523e",
+      "55313b2f145a21e5a9bfd9d1532a752cb92f93e7",
+      "449445ba6a6582e15294940d6444fa4eba4c0aa6",
+      "418acdbe8f52b2ec72273a29831fd4c6faef3831",
+      "59b28b13cecd86530a3351e7e1e8f4715dc12422",
+      "c81726edc503234496657245f3b717e46bef6193",
+      "cde621bf416a3ebaf18317f66696101578dd5047",
+      "3d2d808390cab75380443cd5de770a4d698a04eb",
+      "df88883d00aa84987ec7c51a174e60fbd7883cc0",
+      "760c64954f2ad56be2b085b0dd883dd3fe120793",
+      "829219985c33dbc65884163c90ce34838b13b39a",
+      "673941de95c89419b30c6872d03350ddf266da59",
+      "acd51cd687662fdfb7983708fb2a110598836b33",
+      "18e5beb737fe6e42542915863dfd8bf71496c56a"
+    ],
+    "compact_signature": [
+      "c8bef43210f8dd770996421f168b0dc0d8c7562c",
+      "8d9a7ba8051ea82be534eedd8d24645cf0d9c950",
+      "88a465f5acc4c61586c53c34c3fb86369bf13d5b",
+      "9a6c069d163479b4fb0391dbb717326a03309fed",
+      "99d26816e536a5511fce59efebcfee8fe336ca99",
+      "38574a5bcb1e26b94e5cd55e9f79ef67dfd1c927",
+      "b3cb8c6a78c2aa7b70d36c5b686bedcf53fab709",
+      "40e905ba19a0c6c0159a46142d44b9c4cf716613",
+      "c3bf9c9669b765a5851c4c0a9863bf7c7bea3782",
+      "7df383f364c5898239308405a9fd19e19df8eead",
+      "574f2225ce7e914514281a370a07cb55c9d9271b",
+      "e6dd87a7a7402b8ce960d160128c2f23509d73ff",
+      "f384a6eb7abad0f125286269d7f483450f1dcf7e",
+      "af7466e933bdb740b2e4e61bb9a1448012f43d2e",
+      "bc68ab0432de58c61b944cfc86a9e69c7fbcc308",
+      "c3573e342da0e56dcff59a0be3afbf8433d566d6",
+      "a8c6916f27662356cfe1d382038d3159834ce41c",
+      "e18d95e7bdd0b1cfcdea31a84b704f66ddb26932",
+      "d5ef90dcb247830956fbb822d3588b7b816a7bd1",
+      "bbce9530ac66e3b1c363346fe1a143f6c6147122",
+      "44d3502426811537e04f254ed27d8821891b2804",
+      "2fb016107cddb6d414b13da0c9f552778396523e",
+      "55313b2f145a21e5a9bfd9d1532a752cb92f93e7",
+      "449445ba6a6582e15294940d6444fa4eba4c0aa6",
+      "418acdbe8f52b2ec72273a29831fd4c6faef3831",
+      "59b28b13cecd86530a3351e7e1e8f4715dc12422",
+      "c81726edc503234496657245f3b717e46bef6193",
+      "cde621bf416a3ebaf18317f66696101578dd5047",
+      "3d2d808390cab75380443cd5de770a4d698a04eb",
+      "df88883d00aa84987ec7c51a174e60fbd7883cc0",
+      "760c64954f2ad56be2b085b0dd883dd3fe120793",
+      "829219985c33dbc65884163c90ce34838b13b39a",
+      "673941de95c89419b30c6872d03350ddf266da59",
+      "acd51cd687662fdfb7983708fb2a110598836b33",
+      "18e5beb737fe6e42542915863dfd8bf71496c56a"
+    ]
+  },
+  {
+    "message": "00000000000000000000000000000000",
+    "secretKey": "d3d8e1328f365ce0ee9677cf35fa0ad29d2f56c8",
+    "publicKey": [
+      "d32ebdca109ef638b9bd0d882f07836d9ca448ba",
+      "f14aeb7b2e2e655eacb9b3d8e24680b01d87e195",
+      "be4052111d414836dc99dd1c49e7ba75a2a4c897",
+      "675d27950a00f3fb839f019386be15ee4f09985d",
+      "ce59bd755c2dea948fcf23935f10a939259b5bb5",
+      "0fa560bd74c82ca0d8cd32dbd62a8090550ed6a4",
+      "e524da9aeae2f2dd8dbe48353e1b9462a5be6ac3",
+      "eadd0ce38ac07b5ca163f45a499a67e7417804b6",
+      "e1584069af9a848fe89cbbf1e78e1b2663faa401",
+      "2565f9c7d257eb831f82a61d583e14516f485e12",
+      "c0a299ba3985dc1f4249ea459217c727f17598e3",
+      "e9ea14ea05499cf251bd371dba28781f99d60f60",
+      "c7a86d29a247314873aba5a03ba7ca2a53a1f505",
+      "e190252f8b1ffea8a7131b6cf952dbb833e93086",
+      "b3988cdee0a66f322ae59d778eaddd9f6ece2561",
+      "3577373b9e39b5ccd8b0ceb8731bb901c3391d3e",
+      "9966700241352d17ea676d89483f8428bf009518",
+      "a267a47acdb22c0e686c5d3288e998e1901a319e",
+      "576da7567481c246f9017620bab6d3694fd95040",
+      "3244e3631e0f7f61934da5df741e92bdb18886be",
+      "d52f4692611ddb3c97f42c3aec95b6ac1f7ff9f7",
+      "2785abfc75453b4791573ff587334d0b9f84bde8",
+      "e7acb0961d0fa7385e8f7f69d948461e7ec97914",
+      "ae52edede20e96e3da4bbe367fb9a620d3ff9b27",
+      "6a11320b2deed0fcf1969aa2eb31c8a4f515e78b",
+      "06011f953cfda0a148b1f82ee0e87a4a6d6fecf1",
+      "cb057db621a3c961af6b69f0d92fa02241058d07",
+      "fffbd81b36235e740f845540f7414977c05dac95",
+      "707eda1fd197e67170d35ecc05f06a1eafd48826",
+      "dbcae657e2224c306b421cad4aaa3af0571eb979",
+      "5804bdb757b5932e48c40ef95caf631d432457d9",
+      "cea7e3c4b87618f68de6804e4281af1832607b60",
+      "659a0347200d0ea5fd8f966130c95d43c0b32ba8",
+      "cfaa446be13ccbae16cc576cd119777ae7e4db46",
+      "680f0e1c15f1de10974389ff8867cba827b23685"
+    ],
+    "witness": [
+      "85b29255048a71173bc20f21c1cfc5af7e10ad43",
+      "",
+      "7ecffdf71c86a4a2cb521f88b8a75e8e9634f25e",
+      "",
+      "e589d764e7818a465c969afcdc218d99c5db7f78",
+      "",
+      "51ae7d35b0ed9b591b4c31fc2a3dacd4be9080df",
+      "",
+      "9a258b7a852673cfab2f3872a49d2d632364203e",
+      "",
+      "25d7f705514f7685ec72009091211d7fefd29545",
+      "",
+      "8e83e71d1fcde865f29ad6ce1dee9449e94d551c",
+      "",
+      "a200079dd26103b9e3d783e5322483f724f899c9",
+      "",
+      "c66a33a25fdc00a49b9789fa11080251c3f97e96",
+      "",
+      "1bdb282c66ce274395f8962c0b9f89fa34e26264",
+      "",
+      "7da935a262e7a249fb37fa81445c3fb70e3482d6",
+      "",
+      "4cd5befeb586826713fd43e1aaec1316f151beac",
+      "",
+      "0ff4a6ad19d13f7115f920e4c3f18845cba0643d",
+      "",
+      "dc5c5c8e6c488dd48b660b03952da3d76078d0ce",
+      "",
+      "dd1ff3a92ac9af46e4f576da0664da3c3b57e631",
+      "",
+      "676d3a50542f55fe4a2434e72108a5ef21eeb158",
+      "",
+      "3967c9f5d355733446ffff48f1511ccd4cf08f1e",
+      "",
+      "762fbb5f4bf484edef2e8a8214a4355d4225cf09",
+      "",
+      "df6865f4ce63f6d0b03e0f500cf72c46578ba6a8",
+      "",
+      "f2ff851b7f0fa14c28f86aac70d8663388dcbf0e",
+      "",
+      "ac553a604f9a43c816c55dbb536832617a4e4963",
+      "",
+      "2869f1e7b81b8f8b05d0494224ae76034f924708",
+      "",
+      "4374a633a0902ff8691d12ecf78bb03290ae3813",
+      "",
+      "3f02b8fdc0aa9a3315ffbd8a073c91986d077100",
+      "",
+      "30bae1dcaf63350631af6af57888c210c6a7cd93",
+      "",
+      "fa0afe82c5d1c11d9a5bd4c4db0fdd12c69759ca",
+      "",
+      "5c009a5e29c8a533af3bdef7778c70fe7fa06f81",
+      "",
+      "e02052dd6e287d0823b8e3664d6110c98172be2d",
+      "",
+      "64aab6c57b8e8d1808762476f2e84e2ed2c5ec90",
+      "",
+      "4dadb179232e04c3b8977f92e0e1696580a9eb72",
+      "",
+      "45d6792383afc182403ed99f6ab99336dc494251",
+      "",
+      "eb1be65431de0753bd8726e82c5124c00ca3e439",
+      "",
+      "5e0c887110182a211863c0a31660f2cdf5668009",
+      "01",
+      "584c7bbe09408dd7030e0cf28197d85b052c8fdd",
+      "0e",
+      "bf0ff07e1375231ab7279a23c2dfac49c1ac090d",
+      ""
+    ],
+    "signature": [
+      "85b29255048a71173bc20f21c1cfc5af7e10ad4300",
+      "7ecffdf71c86a4a2cb521f88b8a75e8e9634f25e00",
+      "e589d764e7818a465c969afcdc218d99c5db7f7800",
+      "51ae7d35b0ed9b591b4c31fc2a3dacd4be9080df00",
+      "9a258b7a852673cfab2f3872a49d2d632364203e00",
+      "25d7f705514f7685ec72009091211d7fefd2954500",
+      "8e83e71d1fcde865f29ad6ce1dee9449e94d551c00",
+      "a200079dd26103b9e3d783e5322483f724f899c900",
+      "c66a33a25fdc00a49b9789fa11080251c3f97e9600",
+      "1bdb282c66ce274395f8962c0b9f89fa34e2626400",
+      "7da935a262e7a249fb37fa81445c3fb70e3482d600",
+      "4cd5befeb586826713fd43e1aaec1316f151beac00",
+      "0ff4a6ad19d13f7115f920e4c3f18845cba0643d00",
+      "dc5c5c8e6c488dd48b660b03952da3d76078d0ce00",
+      "dd1ff3a92ac9af46e4f576da0664da3c3b57e63100",
+      "676d3a50542f55fe4a2434e72108a5ef21eeb15800",
+      "3967c9f5d355733446ffff48f1511ccd4cf08f1e00",
+      "762fbb5f4bf484edef2e8a8214a4355d4225cf0900",
+      "df6865f4ce63f6d0b03e0f500cf72c46578ba6a800",
+      "f2ff851b7f0fa14c28f86aac70d8663388dcbf0e00",
+      "ac553a604f9a43c816c55dbb536832617a4e496300",
+      "2869f1e7b81b8f8b05d0494224ae76034f92470800",
+      "4374a633a0902ff8691d12ecf78bb03290ae381300",
+      "3f02b8fdc0aa9a3315ffbd8a073c91986d07710000",
+      "30bae1dcaf63350631af6af57888c210c6a7cd9300",
+      "fa0afe82c5d1c11d9a5bd4c4db0fdd12c69759ca00",
+      "5c009a5e29c8a533af3bdef7778c70fe7fa06f8100",
+      "e02052dd6e287d0823b8e3664d6110c98172be2d00",
+      "64aab6c57b8e8d1808762476f2e84e2ed2c5ec9000",
+      "4dadb179232e04c3b8977f92e0e1696580a9eb7200",
+      "45d6792383afc182403ed99f6ab99336dc49425100",
+      "eb1be65431de0753bd8726e82c5124c00ca3e43900",
+      "5e0c887110182a211863c0a31660f2cdf566800901",
+      "584c7bbe09408dd7030e0cf28197d85b052c8fdd0e",
+      "bf0ff07e1375231ab7279a23c2dfac49c1ac090d00"
+    ],
+    "compact_witness": [
+      "85b29255048a71173bc20f21c1cfc5af7e10ad43",
+      "7ecffdf71c86a4a2cb521f88b8a75e8e9634f25e",
+      "e589d764e7818a465c969afcdc218d99c5db7f78",
+      "51ae7d35b0ed9b591b4c31fc2a3dacd4be9080df",
+      "9a258b7a852673cfab2f3872a49d2d632364203e",
+      "25d7f705514f7685ec72009091211d7fefd29545",
+      "8e83e71d1fcde865f29ad6ce1dee9449e94d551c",
+      "a200079dd26103b9e3d783e5322483f724f899c9",
+      "c66a33a25fdc00a49b9789fa11080251c3f97e96",
+      "1bdb282c66ce274395f8962c0b9f89fa34e26264",
+      "7da935a262e7a249fb37fa81445c3fb70e3482d6",
+      "4cd5befeb586826713fd43e1aaec1316f151beac",
+      "0ff4a6ad19d13f7115f920e4c3f18845cba0643d",
+      "dc5c5c8e6c488dd48b660b03952da3d76078d0ce",
+      "dd1ff3a92ac9af46e4f576da0664da3c3b57e631",
+      "676d3a50542f55fe4a2434e72108a5ef21eeb158",
+      "3967c9f5d355733446ffff48f1511ccd4cf08f1e",
+      "762fbb5f4bf484edef2e8a8214a4355d4225cf09",
+      "df6865f4ce63f6d0b03e0f500cf72c46578ba6a8",
+      "f2ff851b7f0fa14c28f86aac70d8663388dcbf0e",
+      "ac553a604f9a43c816c55dbb536832617a4e4963",
+      "2869f1e7b81b8f8b05d0494224ae76034f924708",
+      "4374a633a0902ff8691d12ecf78bb03290ae3813",
+      "3f02b8fdc0aa9a3315ffbd8a073c91986d077100",
+      "30bae1dcaf63350631af6af57888c210c6a7cd93",
+      "fa0afe82c5d1c11d9a5bd4c4db0fdd12c69759ca",
+      "5c009a5e29c8a533af3bdef7778c70fe7fa06f81",
+      "e02052dd6e287d0823b8e3664d6110c98172be2d",
+      "64aab6c57b8e8d1808762476f2e84e2ed2c5ec90",
+      "4dadb179232e04c3b8977f92e0e1696580a9eb72",
+      "45d6792383afc182403ed99f6ab99336dc494251",
+      "eb1be65431de0753bd8726e82c5124c00ca3e439",
+      "5e0c887110182a211863c0a31660f2cdf5668009",
+      "584c7bbe09408dd7030e0cf28197d85b052c8fdd",
+      "bf0ff07e1375231ab7279a23c2dfac49c1ac090d"
+    ],
+    "compact_signature": [
+      "85b29255048a71173bc20f21c1cfc5af7e10ad43",
+      "7ecffdf71c86a4a2cb521f88b8a75e8e9634f25e",
+      "e589d764e7818a465c969afcdc218d99c5db7f78",
+      "51ae7d35b0ed9b591b4c31fc2a3dacd4be9080df",
+      "9a258b7a852673cfab2f3872a49d2d632364203e",
+      "25d7f705514f7685ec72009091211d7fefd29545",
+      "8e83e71d1fcde865f29ad6ce1dee9449e94d551c",
+      "a200079dd26103b9e3d783e5322483f724f899c9",
+      "c66a33a25fdc00a49b9789fa11080251c3f97e96",
+      "1bdb282c66ce274395f8962c0b9f89fa34e26264",
+      "7da935a262e7a249fb37fa81445c3fb70e3482d6",
+      "4cd5befeb586826713fd43e1aaec1316f151beac",
+      "0ff4a6ad19d13f7115f920e4c3f18845cba0643d",
+      "dc5c5c8e6c488dd48b660b03952da3d76078d0ce",
+      "dd1ff3a92ac9af46e4f576da0664da3c3b57e631",
+      "676d3a50542f55fe4a2434e72108a5ef21eeb158",
+      "3967c9f5d355733446ffff48f1511ccd4cf08f1e",
+      "762fbb5f4bf484edef2e8a8214a4355d4225cf09",
+      "df6865f4ce63f6d0b03e0f500cf72c46578ba6a8",
+      "f2ff851b7f0fa14c28f86aac70d8663388dcbf0e",
+      "ac553a604f9a43c816c55dbb536832617a4e4963",
+      "2869f1e7b81b8f8b05d0494224ae76034f924708",
+      "4374a633a0902ff8691d12ecf78bb03290ae3813",
+      "3f02b8fdc0aa9a3315ffbd8a073c91986d077100",
+      "30bae1dcaf63350631af6af57888c210c6a7cd93",
+      "fa0afe82c5d1c11d9a5bd4c4db0fdd12c69759ca",
+      "5c009a5e29c8a533af3bdef7778c70fe7fa06f81",
+      "e02052dd6e287d0823b8e3664d6110c98172be2d",
+      "64aab6c57b8e8d1808762476f2e84e2ed2c5ec90",
+      "4dadb179232e04c3b8977f92e0e1696580a9eb72",
+      "45d6792383afc182403ed99f6ab99336dc494251",
+      "eb1be65431de0753bd8726e82c5124c00ca3e439",
+      "5e0c887110182a211863c0a31660f2cdf5668009",
+      "584c7bbe09408dd7030e0cf28197d85b052c8fdd",
+      "bf0ff07e1375231ab7279a23c2dfac49c1ac090d"
+    ]
+  },
+  {
+    "message": "00000000000000000000000000000000",
+    "secretKey": "42b1a3f34e39b282a76bcbf897146c2486f42488",
+    "publicKey": [
+      "63b9762d2b05924a621960650243337a7f125596",
+      "50cdc1466aa8f49c771801be53df878b9432ff52",
+      "419d541df4607cca5ac1adbfd39b08cfae535005",
+      "1f0fc156429b12bf5bdddcdc3de94a448e4cf4c4",
+      "68541d8e7ccdb43b30615a06e93010aac95e9b17",
+      "6561d838116775987411c6d31bece91b8d0327bf",
+      "dbc7ccb27076a9f763a7e3cd1963695b7562af05",
+      "cef239a5af4cb9040eff4cccf262991b3fa49d5a",
+      "61482408789585521e2402810ee896af89c2d5f4",
+      "83b6e9ccc1cdb8b04fcb170ef11c42bd4fe58935",
+      "1d28b3389b6ea7d71151cc7e047c93c44b7c651a",
+      "bd20b410627fde7a3f2fefb1aba56e5916e3266c",
+      "c3b96b131a886fa3514955af96ccda1d961caec7",
+      "459198f3ec963d2a07cf99eab4e4a214882c88e2",
+      "bf0afccafcc92ff47e01b9978517dc35c2917665",
+      "d1f95e70c911377b917c1d5306ab8ef764674dd7",
+      "de73baaed039e92d8162719ac4ff011f94f6eb33",
+      "85f5b2ee2f1dce3d966ec787ff8b7dc74b386bd2",
+      "ac4b480ba2c65800356ce1f01b43ac97e708f807",
+      "8ac6c20958e2c04bd6d76cd5911f838d231ddd1d",
+      "5b62f033e3f321b29036d0560bd8a4a92243b7db",
+      "75a53e5b342787adc9d43a51a6e619fb1b924b37",
+      "94c239b6b1cb64a69393259a9488be6f484016ce",
+      "5ab1f35e1d844bc3993b395abae9e9998a3004ec",
+      "8daee032bcbbaca9ec069063cd95781e0353d5e2",
+      "7b6005545cde56856b465cd188603b752d8f2009",
+      "564eba416590daf5ccd73546557b4bce4a61b5b4",
+      "3ebb7f3ecbf6952844f044814930beb7968fc7d0",
+      "c44463b5a9956d4820f07244b58bbd5df4ff669b",
+      "2ba1ad309ecf0e066bca7255c3905b0c4bd34d44",
+      "c6197054924b288e4e7009be4f43bb7ba32440fa",
+      "cb5aa0df19eddae1949efb1bb16369c81b6edc99",
+      "f19e4e40f4d5629d84c4cdb08390a312de91d276",
+      "b5303c0a8868ae02211c1b17de899f41a537c2c3",
+      "3ff04ae476a5b157bea5468242c0a1cebcfd82c5"
+    ],
+    "witness": [
+      "f9f805e1bf36134a9d0d3c2760a8f38396690645",
+      "",
+      "572d1047f7f3d021d2f27d9f477f7da709eb77a5",
+      "",
+      "4468391b3c1f56c897afe51a43c281aa1ed4d1c1",
+      "",
+      "192beb16ec656e334c48d9e8528028a421c5db88",
+      "",
+      "86dbb8e0d9073c8c55d5dcfb40ba978b0f0d6333",
+      "",
+      "358c15049a9788f4730112845b85a3c408a9bd80",
+      "",
+      "3d73f11c088ffffeccf4b8e85efe3f94dfaeeaba",
+      "",
+      "e171b7693f5630dc2a2dace1569c521e6762f0d5",
+      "",
+      "96a46ec3d56608f7a7b967a68af54f53a7f69203",
+      "",
+      "22996ebb71d653018a1abffe3d984217f4e511e5",
+      "",
+      "0d87239ea463d4be03a3b7629378509afe63641d",
+      "",
+      "8fedfa13a87d4d1604bdecfe6d32f9e73b9d11dd",
+      "",
+      "225eb8cd1178d805a3ee881ca137fbc5cb9af9da",
+      "",
+      "b966c2a3ead607cc2ceee093345ca8def28a5686",
+      "",
+      "114508e6c41c2fa1722beee97899739389c335a7",
+      "",
+      "082f245ef9b760340fbe5d12c195492d1c6175d6",
+      "",
+      "657d565be0c9a490ab3c500ddf266b4a31b8d382",
+      "",
+      "ac4a5aabb0d6cf6bc7b0c02feec2d2f6a8a9fb46",
+      "",
+      "ce8ef2fa72c75fdcd624a651cd35c45db1b14785",
+      "",
+      "a37fe07f7ad30f861de3478c08cd31e8f9b338f8",
+      "",
+      "54ecc481e9989e3997cbaeef9ff29cb1a0364675",
+      "",
+      "522b2737a9bcf4966523baca980711c1b22656ac",
+      "",
+      "388155a97e93c7495ab1f52d3b5c128e018c1ba4",
+      "",
+      "c92ee94eb61aeffa29967939e5df9424eb0fcabc",
+      "",
+      "376680f56df5e9711837d5003636c1a5b10c8d77",
+      "",
+      "0024585bdf1c04246d5b1c9b986e1fd06fecd47f",
+      "",
+      "b1dccdb2ceb3749071c33c5ad288a23d2391bb56",
+      "",
+      "06ccc9a0b5aaca72e38d7611940794531d2673e9",
+      "",
+      "738f9e76ca0caafd5e49d18539ad4abe30878179",
+      "",
+      "f85580911cbba44fb1c14966cd1fe166e081e8bb",
+      "",
+      "0558bb937f9f6aa923ee4d6221b0cc6144ef761d",
+      "",
+      "6cd995a127cae45967c9062a0908053abd6e9416",
+      "",
+      "f6969fb1bdf6bff4b7cef36b8aec0da6900e8ce6",
+      "01",
+      "daf80e4045f30c8f87bed92345ef5a27e7c0af74",
+      "0e",
+      "cff74a6c69def44f5f46f4b508e4a0d9ae666e66",
+      ""
+    ],
+    "signature": [
+      "f9f805e1bf36134a9d0d3c2760a8f3839669064500",
+      "572d1047f7f3d021d2f27d9f477f7da709eb77a500",
+      "4468391b3c1f56c897afe51a43c281aa1ed4d1c100",
+      "192beb16ec656e334c48d9e8528028a421c5db8800",
+      "86dbb8e0d9073c8c55d5dcfb40ba978b0f0d633300",
+      "358c15049a9788f4730112845b85a3c408a9bd8000",
+      "3d73f11c088ffffeccf4b8e85efe3f94dfaeeaba00",
+      "e171b7693f5630dc2a2dace1569c521e6762f0d500",
+      "96a46ec3d56608f7a7b967a68af54f53a7f6920300",
+      "22996ebb71d653018a1abffe3d984217f4e511e500",
+      "0d87239ea463d4be03a3b7629378509afe63641d00",
+      "8fedfa13a87d4d1604bdecfe6d32f9e73b9d11dd00",
+      "225eb8cd1178d805a3ee881ca137fbc5cb9af9da00",
+      "b966c2a3ead607cc2ceee093345ca8def28a568600",
+      "114508e6c41c2fa1722beee97899739389c335a700",
+      "082f245ef9b760340fbe5d12c195492d1c6175d600",
+      "657d565be0c9a490ab3c500ddf266b4a31b8d38200",
+      "ac4a5aabb0d6cf6bc7b0c02feec2d2f6a8a9fb4600",
+      "ce8ef2fa72c75fdcd624a651cd35c45db1b1478500",
+      "a37fe07f7ad30f861de3478c08cd31e8f9b338f800",
+      "54ecc481e9989e3997cbaeef9ff29cb1a036467500",
+      "522b2737a9bcf4966523baca980711c1b22656ac00",
+      "388155a97e93c7495ab1f52d3b5c128e018c1ba400",
+      "c92ee94eb61aeffa29967939e5df9424eb0fcabc00",
+      "376680f56df5e9711837d5003636c1a5b10c8d7700",
+      "0024585bdf1c04246d5b1c9b986e1fd06fecd47f00",
+      "b1dccdb2ceb3749071c33c5ad288a23d2391bb5600",
+      "06ccc9a0b5aaca72e38d7611940794531d2673e900",
+      "738f9e76ca0caafd5e49d18539ad4abe3087817900",
+      "f85580911cbba44fb1c14966cd1fe166e081e8bb00",
+      "0558bb937f9f6aa923ee4d6221b0cc6144ef761d00",
+      "6cd995a127cae45967c9062a0908053abd6e941600",
+      "f6969fb1bdf6bff4b7cef36b8aec0da6900e8ce601",
+      "daf80e4045f30c8f87bed92345ef5a27e7c0af740e",
+      "cff74a6c69def44f5f46f4b508e4a0d9ae666e6600"
+    ],
+    "compact_witness": [
+      "f9f805e1bf36134a9d0d3c2760a8f38396690645",
+      "572d1047f7f3d021d2f27d9f477f7da709eb77a5",
+      "4468391b3c1f56c897afe51a43c281aa1ed4d1c1",
+      "192beb16ec656e334c48d9e8528028a421c5db88",
+      "86dbb8e0d9073c8c55d5dcfb40ba978b0f0d6333",
+      "358c15049a9788f4730112845b85a3c408a9bd80",
+      "3d73f11c088ffffeccf4b8e85efe3f94dfaeeaba",
+      "e171b7693f5630dc2a2dace1569c521e6762f0d5",
+      "96a46ec3d56608f7a7b967a68af54f53a7f69203",
+      "22996ebb71d653018a1abffe3d984217f4e511e5",
+      "0d87239ea463d4be03a3b7629378509afe63641d",
+      "8fedfa13a87d4d1604bdecfe6d32f9e73b9d11dd",
+      "225eb8cd1178d805a3ee881ca137fbc5cb9af9da",
+      "b966c2a3ead607cc2ceee093345ca8def28a5686",
+      "114508e6c41c2fa1722beee97899739389c335a7",
+      "082f245ef9b760340fbe5d12c195492d1c6175d6",
+      "657d565be0c9a490ab3c500ddf266b4a31b8d382",
+      "ac4a5aabb0d6cf6bc7b0c02feec2d2f6a8a9fb46",
+      "ce8ef2fa72c75fdcd624a651cd35c45db1b14785",
+      "a37fe07f7ad30f861de3478c08cd31e8f9b338f8",
+      "54ecc481e9989e3997cbaeef9ff29cb1a0364675",
+      "522b2737a9bcf4966523baca980711c1b22656ac",
+      "388155a97e93c7495ab1f52d3b5c128e018c1ba4",
+      "c92ee94eb61aeffa29967939e5df9424eb0fcabc",
+      "376680f56df5e9711837d5003636c1a5b10c8d77",
+      "0024585bdf1c04246d5b1c9b986e1fd06fecd47f",
+      "b1dccdb2ceb3749071c33c5ad288a23d2391bb56",
+      "06ccc9a0b5aaca72e38d7611940794531d2673e9",
+      "738f9e76ca0caafd5e49d18539ad4abe30878179",
+      "f85580911cbba44fb1c14966cd1fe166e081e8bb",
+      "0558bb937f9f6aa923ee4d6221b0cc6144ef761d",
+      "6cd995a127cae45967c9062a0908053abd6e9416",
+      "f6969fb1bdf6bff4b7cef36b8aec0da6900e8ce6",
+      "daf80e4045f30c8f87bed92345ef5a27e7c0af74",
+      "cff74a6c69def44f5f46f4b508e4a0d9ae666e66"
+    ],
+    "compact_signature": [
+      "f9f805e1bf36134a9d0d3c2760a8f38396690645",
+      "572d1047f7f3d021d2f27d9f477f7da709eb77a5",
+      "4468391b3c1f56c897afe51a43c281aa1ed4d1c1",
+      "192beb16ec656e334c48d9e8528028a421c5db88",
+      "86dbb8e0d9073c8c55d5dcfb40ba978b0f0d6333",
+      "358c15049a9788f4730112845b85a3c408a9bd80",
+      "3d73f11c088ffffeccf4b8e85efe3f94dfaeeaba",
+      "e171b7693f5630dc2a2dace1569c521e6762f0d5",
+      "96a46ec3d56608f7a7b967a68af54f53a7f69203",
+      "22996ebb71d653018a1abffe3d984217f4e511e5",
+      "0d87239ea463d4be03a3b7629378509afe63641d",
+      "8fedfa13a87d4d1604bdecfe6d32f9e73b9d11dd",
+      "225eb8cd1178d805a3ee881ca137fbc5cb9af9da",
+      "b966c2a3ead607cc2ceee093345ca8def28a5686",
+      "114508e6c41c2fa1722beee97899739389c335a7",
+      "082f245ef9b760340fbe5d12c195492d1c6175d6",
+      "657d565be0c9a490ab3c500ddf266b4a31b8d382",
+      "ac4a5aabb0d6cf6bc7b0c02feec2d2f6a8a9fb46",
+      "ce8ef2fa72c75fdcd624a651cd35c45db1b14785",
+      "a37fe07f7ad30f861de3478c08cd31e8f9b338f8",
+      "54ecc481e9989e3997cbaeef9ff29cb1a0364675",
+      "522b2737a9bcf4966523baca980711c1b22656ac",
+      "388155a97e93c7495ab1f52d3b5c128e018c1ba4",
+      "c92ee94eb61aeffa29967939e5df9424eb0fcabc",
+      "376680f56df5e9711837d5003636c1a5b10c8d77",
+      "0024585bdf1c04246d5b1c9b986e1fd06fecd47f",
+      "b1dccdb2ceb3749071c33c5ad288a23d2391bb56",
+      "06ccc9a0b5aaca72e38d7611940794531d2673e9",
+      "738f9e76ca0caafd5e49d18539ad4abe30878179",
+      "f85580911cbba44fb1c14966cd1fe166e081e8bb",
+      "0558bb937f9f6aa923ee4d6221b0cc6144ef761d",
+      "6cd995a127cae45967c9062a0908053abd6e9416",
+      "f6969fb1bdf6bff4b7cef36b8aec0da6900e8ce6",
+      "daf80e4045f30c8f87bed92345ef5a27e7c0af74",
+      "cff74a6c69def44f5f46f4b508e4a0d9ae666e66"
+    ]
+  },
+  {
+    "message": "ffffffffffffffffffffffffffffffff",
+    "secretKey": "ac56a0e341c9173b31c4279f68cef9cd83cd1100",
+    "publicKey": [
+      "fd9b1ec23d9c9c6eab58fc35384aa8cc0a815d4a",
+      "ec21bd3afb6ff93759db719839f7ca9964c5028a",
+      "f0d2aebbcfa6b91e940a55719fea9e18d8ce48f0",
+      "f54d9567fcb0296ee3cb87e6f07072b7b692759a",
+      "8603d6881c4dc4069a1a51825d479daa7f113ca1",
+      "2f402f90bba3caaac4f30c1302ebf40b0966ea7f",
+      "22c900da8a3148af9e00ef6165545e8ccae87d92",
+      "88d00e09a61a679bad6b1bdb2736ceac0f3711e5",
+      "e35ecbaf39c3351511fb37872e170b946137ef93",
+      "b09bcc339a91b6004cad25e6be2e81ba494838a0",
+      "20e1ea95549c24ff6ef8e32e0f1c12df21aafe50",
+      "0139b00064dd4f3168d284e1077ec77c3719d5f1",
+      "d5177c29b1fa8b59ad2d0ccf5bdfc39516b42641",
+      "b0fd947d81562c87988a2bf2fe07b7e4351ffd1f",
+      "6e4b60848669fe977a7fd4c9cf310277a206c908",
+      "e9b1cecbc69ffd6e2222f78bc37135f96adfe843",
+      "007768a009ee142b1d200c3905d86c09d025d7a1",
+      "7cb64876271b25da5f5208288ee1d80278e6ed7b",
+      "04e1e3c18ec8095e01da6ba7fafc03240aa423e9",
+      "44c9a0025a535266d1b1b9e9e09eecf53571d197",
+      "61fab5a5cb8500ce1dd960241f97e3ec0550531f",
+      "14950ec1ba60e957c256f8283b9109cfefa7cd6e",
+      "bd4cde55eb19ac23d42d42c2436896b06494f834",
+      "f9c66f987e8572423133aac3c7ba42f0e5b4dce1",
+      "09e1bae651adf9d9abc30aec56608694f9d4f249",
+      "b58c02d17d2393de43171daee5259ab28056cce0",
+      "370576ca7ec3cb1f87d5ec48fab96a45cc6bc9f6",
+      "32bfbc82de0fd021aa37b4999864527f9022949b",
+      "99f395327e9307a3dd960409abe06778b567dcdb",
+      "5e0d970f620d3317136df0faa9cf5d4f972480e2",
+      "368aec0ea912533994b52e11018a0f0dfae24113",
+      "e54e2355ccc818bdee8263aad9b1c341c966b91f",
+      "33e2bfe922aefc19618f657f6c65429a6b45edc1",
+      "005d49eb115db6b85b26a442328c3f6d16d50663",
+      "d32a8c916ac710fde787fa2f5cf6d8ffe71e2c62"
+    ],
+    "witness": [
+      "fd9b1ec23d9c9c6eab58fc35384aa8cc0a815d4a",
+      "0f",
+      "ec21bd3afb6ff93759db719839f7ca9964c5028a",
+      "0f",
+      "f0d2aebbcfa6b91e940a55719fea9e18d8ce48f0",
+      "0f",
+      "f54d9567fcb0296ee3cb87e6f07072b7b692759a",
+      "0f",
+      "8603d6881c4dc4069a1a51825d479daa7f113ca1",
+      "0f",
+      "2f402f90bba3caaac4f30c1302ebf40b0966ea7f",
+      "0f",
+      "22c900da8a3148af9e00ef6165545e8ccae87d92",
+      "0f",
+      "88d00e09a61a679bad6b1bdb2736ceac0f3711e5",
+      "0f",
+      "e35ecbaf39c3351511fb37872e170b946137ef93",
+      "0f",
+      "b09bcc339a91b6004cad25e6be2e81ba494838a0",
+      "0f",
+      "20e1ea95549c24ff6ef8e32e0f1c12df21aafe50",
+      "0f",
+      "0139b00064dd4f3168d284e1077ec77c3719d5f1",
+      "0f",
+      "d5177c29b1fa8b59ad2d0ccf5bdfc39516b42641",
+      "0f",
+      "b0fd947d81562c87988a2bf2fe07b7e4351ffd1f",
+      "0f",
+      "6e4b60848669fe977a7fd4c9cf310277a206c908",
+      "0f",
+      "e9b1cecbc69ffd6e2222f78bc37135f96adfe843",
+      "0f",
+      "007768a009ee142b1d200c3905d86c09d025d7a1",
+      "0f",
+      "7cb64876271b25da5f5208288ee1d80278e6ed7b",
+      "0f",
+      "04e1e3c18ec8095e01da6ba7fafc03240aa423e9",
+      "0f",
+      "44c9a0025a535266d1b1b9e9e09eecf53571d197",
+      "0f",
+      "61fab5a5cb8500ce1dd960241f97e3ec0550531f",
+      "0f",
+      "14950ec1ba60e957c256f8283b9109cfefa7cd6e",
+      "0f",
+      "bd4cde55eb19ac23d42d42c2436896b06494f834",
+      "0f",
+      "f9c66f987e8572423133aac3c7ba42f0e5b4dce1",
+      "0f",
+      "09e1bae651adf9d9abc30aec56608694f9d4f249",
+      "0f",
+      "b58c02d17d2393de43171daee5259ab28056cce0",
+      "0f",
+      "370576ca7ec3cb1f87d5ec48fab96a45cc6bc9f6",
+      "0f",
+      "32bfbc82de0fd021aa37b4999864527f9022949b",
+      "0f",
+      "99f395327e9307a3dd960409abe06778b567dcdb",
+      "0f",
+      "5e0d970f620d3317136df0faa9cf5d4f972480e2",
+      "0f",
+      "368aec0ea912533994b52e11018a0f0dfae24113",
+      "0f",
+      "e54e2355ccc818bdee8263aad9b1c341c966b91f",
+      "0f",
+      "7a4ba0f01c6901705ba8f1980017b84ff961fcad",
+      "",
+      "f0e5bd5fa2876498fc858a2245d6a8222f59d0a5",
+      "",
+      "942ab34b2bfcd9be71db08aa2b640fa8104115b1",
+      ""
+    ],
+    "signature": [
+      "fd9b1ec23d9c9c6eab58fc35384aa8cc0a815d4a0f",
+      "ec21bd3afb6ff93759db719839f7ca9964c5028a0f",
+      "f0d2aebbcfa6b91e940a55719fea9e18d8ce48f00f",
+      "f54d9567fcb0296ee3cb87e6f07072b7b692759a0f",
+      "8603d6881c4dc4069a1a51825d479daa7f113ca10f",
+      "2f402f90bba3caaac4f30c1302ebf40b0966ea7f0f",
+      "22c900da8a3148af9e00ef6165545e8ccae87d920f",
+      "88d00e09a61a679bad6b1bdb2736ceac0f3711e50f",
+      "e35ecbaf39c3351511fb37872e170b946137ef930f",
+      "b09bcc339a91b6004cad25e6be2e81ba494838a00f",
+      "20e1ea95549c24ff6ef8e32e0f1c12df21aafe500f",
+      "0139b00064dd4f3168d284e1077ec77c3719d5f10f",
+      "d5177c29b1fa8b59ad2d0ccf5bdfc39516b426410f",
+      "b0fd947d81562c87988a2bf2fe07b7e4351ffd1f0f",
+      "6e4b60848669fe977a7fd4c9cf310277a206c9080f",
+      "e9b1cecbc69ffd6e2222f78bc37135f96adfe8430f",
+      "007768a009ee142b1d200c3905d86c09d025d7a10f",
+      "7cb64876271b25da5f5208288ee1d80278e6ed7b0f",
+      "04e1e3c18ec8095e01da6ba7fafc03240aa423e90f",
+      "44c9a0025a535266d1b1b9e9e09eecf53571d1970f",
+      "61fab5a5cb8500ce1dd960241f97e3ec0550531f0f",
+      "14950ec1ba60e957c256f8283b9109cfefa7cd6e0f",
+      "bd4cde55eb19ac23d42d42c2436896b06494f8340f",
+      "f9c66f987e8572423133aac3c7ba42f0e5b4dce10f",
+      "09e1bae651adf9d9abc30aec56608694f9d4f2490f",
+      "b58c02d17d2393de43171daee5259ab28056cce00f",
+      "370576ca7ec3cb1f87d5ec48fab96a45cc6bc9f60f",
+      "32bfbc82de0fd021aa37b4999864527f9022949b0f",
+      "99f395327e9307a3dd960409abe06778b567dcdb0f",
+      "5e0d970f620d3317136df0faa9cf5d4f972480e20f",
+      "368aec0ea912533994b52e11018a0f0dfae241130f",
+      "e54e2355ccc818bdee8263aad9b1c341c966b91f0f",
+      "7a4ba0f01c6901705ba8f1980017b84ff961fcad00",
+      "f0e5bd5fa2876498fc858a2245d6a8222f59d0a500",
+      "942ab34b2bfcd9be71db08aa2b640fa8104115b100"
+    ],
+    "compact_witness": [
+      "fd9b1ec23d9c9c6eab58fc35384aa8cc0a815d4a",
+      "ec21bd3afb6ff93759db719839f7ca9964c5028a",
+      "f0d2aebbcfa6b91e940a55719fea9e18d8ce48f0",
+      "f54d9567fcb0296ee3cb87e6f07072b7b692759a",
+      "8603d6881c4dc4069a1a51825d479daa7f113ca1",
+      "2f402f90bba3caaac4f30c1302ebf40b0966ea7f",
+      "22c900da8a3148af9e00ef6165545e8ccae87d92",
+      "88d00e09a61a679bad6b1bdb2736ceac0f3711e5",
+      "e35ecbaf39c3351511fb37872e170b946137ef93",
+      "b09bcc339a91b6004cad25e6be2e81ba494838a0",
+      "20e1ea95549c24ff6ef8e32e0f1c12df21aafe50",
+      "0139b00064dd4f3168d284e1077ec77c3719d5f1",
+      "d5177c29b1fa8b59ad2d0ccf5bdfc39516b42641",
+      "b0fd947d81562c87988a2bf2fe07b7e4351ffd1f",
+      "6e4b60848669fe977a7fd4c9cf310277a206c908",
+      "e9b1cecbc69ffd6e2222f78bc37135f96adfe843",
+      "007768a009ee142b1d200c3905d86c09d025d7a1",
+      "7cb64876271b25da5f5208288ee1d80278e6ed7b",
+      "04e1e3c18ec8095e01da6ba7fafc03240aa423e9",
+      "44c9a0025a535266d1b1b9e9e09eecf53571d197",
+      "61fab5a5cb8500ce1dd960241f97e3ec0550531f",
+      "14950ec1ba60e957c256f8283b9109cfefa7cd6e",
+      "bd4cde55eb19ac23d42d42c2436896b06494f834",
+      "f9c66f987e8572423133aac3c7ba42f0e5b4dce1",
+      "09e1bae651adf9d9abc30aec56608694f9d4f249",
+      "b58c02d17d2393de43171daee5259ab28056cce0",
+      "370576ca7ec3cb1f87d5ec48fab96a45cc6bc9f6",
+      "32bfbc82de0fd021aa37b4999864527f9022949b",
+      "99f395327e9307a3dd960409abe06778b567dcdb",
+      "5e0d970f620d3317136df0faa9cf5d4f972480e2",
+      "368aec0ea912533994b52e11018a0f0dfae24113",
+      "e54e2355ccc818bdee8263aad9b1c341c966b91f",
+      "7a4ba0f01c6901705ba8f1980017b84ff961fcad",
+      "f0e5bd5fa2876498fc858a2245d6a8222f59d0a5",
+      "942ab34b2bfcd9be71db08aa2b640fa8104115b1"
+    ],
+    "compact_signature": [
+      "fd9b1ec23d9c9c6eab58fc35384aa8cc0a815d4a",
+      "ec21bd3afb6ff93759db719839f7ca9964c5028a",
+      "f0d2aebbcfa6b91e940a55719fea9e18d8ce48f0",
+      "f54d9567fcb0296ee3cb87e6f07072b7b692759a",
+      "8603d6881c4dc4069a1a51825d479daa7f113ca1",
+      "2f402f90bba3caaac4f30c1302ebf40b0966ea7f",
+      "22c900da8a3148af9e00ef6165545e8ccae87d92",
+      "88d00e09a61a679bad6b1bdb2736ceac0f3711e5",
+      "e35ecbaf39c3351511fb37872e170b946137ef93",
+      "b09bcc339a91b6004cad25e6be2e81ba494838a0",
+      "20e1ea95549c24ff6ef8e32e0f1c12df21aafe50",
+      "0139b00064dd4f3168d284e1077ec77c3719d5f1",
+      "d5177c29b1fa8b59ad2d0ccf5bdfc39516b42641",
+      "b0fd947d81562c87988a2bf2fe07b7e4351ffd1f",
+      "6e4b60848669fe977a7fd4c9cf310277a206c908",
+      "e9b1cecbc69ffd6e2222f78bc37135f96adfe843",
+      "007768a009ee142b1d200c3905d86c09d025d7a1",
+      "7cb64876271b25da5f5208288ee1d80278e6ed7b",
+      "04e1e3c18ec8095e01da6ba7fafc03240aa423e9",
+      "44c9a0025a535266d1b1b9e9e09eecf53571d197",
+      "61fab5a5cb8500ce1dd960241f97e3ec0550531f",
+      "14950ec1ba60e957c256f8283b9109cfefa7cd6e",
+      "bd4cde55eb19ac23d42d42c2436896b06494f834",
+      "f9c66f987e8572423133aac3c7ba42f0e5b4dce1",
+      "09e1bae651adf9d9abc30aec56608694f9d4f249",
+      "b58c02d17d2393de43171daee5259ab28056cce0",
+      "370576ca7ec3cb1f87d5ec48fab96a45cc6bc9f6",
+      "32bfbc82de0fd021aa37b4999864527f9022949b",
+      "99f395327e9307a3dd960409abe06778b567dcdb",
+      "5e0d970f620d3317136df0faa9cf5d4f972480e2",
+      "368aec0ea912533994b52e11018a0f0dfae24113",
+      "e54e2355ccc818bdee8263aad9b1c341c966b91f",
+      "7a4ba0f01c6901705ba8f1980017b84ff961fcad",
+      "f0e5bd5fa2876498fc858a2245d6a8222f59d0a5",
+      "942ab34b2bfcd9be71db08aa2b640fa8104115b1"
+    ]
+  },
+  {
+    "message": "60c23423e1cd37ec9b3ce8f654b66f9a",
+    "secretKey": "2ee83010e09ea393bf6c562887350961bb69fccd",
+    "publicKey": [
+      "db625011c38908248b4c676615e8a68482271dfa",
+      "8472ec21b8ac493334cbba46719a6b1eab80bc10",
+      "78db8fd8f1cd528304a024ded2afe73475cd7f0d",
+      "8d83a283a9822524c7038e378e0e65b5f00a11f0",
+      "a572642a5b7a5b96bcbf2f53730428bc87f67064",
+      "1c5146b64bb4305ca639ab85d00c82587e0e177a",
+      "0db14e7da740c09ea46f86474f13b82badb4581f",
+      "50c9cd30d7f370925087d858eb9a64e7a0bfa4d0",
+      "cbea78abc172d9671d78c546977de0cc96bde6b4",
+      "b0e26f64a227e7eacb4f2a39f57d3ddfd12ac4d0",
+      "8f48c769e77fc475236867c1b1176af681d3ed21",
+      "0a74292b45445f0a1dae60c38b6c28b2d7b2ea41",
+      "beb727b2167f095db2737b3bf6641a498853e45c",
+      "1d5e5b7c578a9781dde7b4518691f0213a64b325",
+      "e659dc08a73c8c69bfadeb808308ff2862cd469b",
+      "422ec6ce705e1fa27160d66222e3c28160298ba0",
+      "fe44adac26335ae7156639967997e3e8450ad65e",
+      "b27352e8a1d474a47d42fd65336b15f8fe0665d7",
+      "b15ac897bc98278138e15b50f8f2cc7289291d19",
+      "3c477690c7d2f1beec8adc4dc1dd7d81dd88796e",
+      "c2b80cdbc81254a38100d3b3387461d5a5631240",
+      "e06e39c955f88e8b2fd30ff4c8b15c0aa646d11f",
+      "393f04d132a6167a44279af54d8c28352462ab62",
+      "71ab641e2d742653b39959f8bbeaa2828b94268d",
+      "40e6ff34ffe5e88e136532c9430bcb77b4599d53",
+      "eeeeca4e292cf3eb202fc39eabd9253b12fac63b",
+      "ba6c4c7a0c23f8ce818c5a416cd09c8daaed3ac8",
+      "526894c62f834aa6b24ba39096d4b4c325ba21f4",
+      "5baab6d9c3e702fa8b5eb33a83122cb01760b129",
+      "890f983041739a89f8642e9f4ecce34c1748a3da",
+      "43ad7817962e92382efb98f1c1797fc763472747",
+      "03cc5fb4f606c1b6f0b2ce03191fe4709109c035",
+      "a8a3b4eecc33504d187273ed5993de7b5b000ac2",
+      "e148d6ff225900edd3c06fff4c0dc5e633a0c285",
+      "ba25208d027716ef7167e9783daa6cc24875c094"
+    ],
+    "witness": [
+      "4f602ff3d069de73734fca95e3ac35d45d858a5d",
+      "09",
+      "dc5a779b5bd4da0f2f9fc115abf51aa591c16344",
+      "0a",
+      "1da7a5a219acf9d3ab601626851da3efd1b6bf6d",
+      "06",
+      "8d83a283a9822524c7038e378e0e65b5f00a11f0",
+      "0f",
+      "4f4d53d7b5abedd16b6f1affdea983fb00f3b60c",
+      "0b",
+      "902548ff1fbd8f9520a944980a4b1aeab4c18b8d",
+      "06",
+      "2fc71c8fd5e7475c1bb4b56a0333a6d626822d85",
+      "05",
+      "dc61315bc4bdfbfc71576543e521423b0432d029",
+      "04",
+      "cbea78abc172d9671d78c546977de0cc96bde6b4",
+      "0f",
+      "a5b69f6f730bdd545f787a817faad4a890d88757",
+      "06",
+      "75ff48fc0c7c3eebf97f425d4f82e6fb85aa4585",
+      "0e",
+      "78cc79b12ab240c22aa4ad296c3e45a9617499d8",
+      "08",
+      "68d1d8eaf483f19cf1efe385ee8540bbae8b291b",
+      "03",
+      "6c564853ac2bd072635c2fd8e34d4f326499f6b9",
+      "0c",
+      "eda0eade826a8e4dc671b5a608759094608b3a89",
+      "09",
+      "1bc6bc3f6fb30034e9192a7cbb5cae68a03fd71b",
+      "0b",
+      "13bc0a95f7238cb06df77e573a4aca24c6d0da1a",
+      "0e",
+      "e592a6da7652dcbeb82b06e726a615965599c44f",
+      "0c",
+      "39552b2f52fb64dcbbb68d3b0a650317b9173a85",
+      "03",
+      "b0efd468b55af5270ad3b0c3f8f0e9d8d8b0ac3c",
+      "07",
+      "d1b899dda93c19ffb42e221490e2432a149e898f",
+      "0c",
+      "d95ce420df7b2e97de4606f41bbfb9b14022b791",
+      "0d",
+      "c17157694ea7dc1606785708224b2b8e056f63fe",
+      "0e",
+      "0d8918db16903706a1182855d18dab3d34276b88",
+      "01",
+      "37bc77348d08bef8edf5f202a4341217671e1aee",
+      "02",
+      "2059797f883326b981ed9c94b5960a4a1f146a86",
+      "03",
+      "ed4ebc72a1d3babab9ae588d9ce521978d6a5115",
+      "03",
+      "f6c03eec9cbb0cc8032e71a033d074a6e4ecca5f",
+      "04",
+      "072f0411a9eb3367d22fd53f392035ad3bf82b40",
+      "0c",
+      "22ab52cf209fb45bd37425ec31a87d5a12848622",
+      "02",
+      "de3fac0f1485d62c53a1625273e23b89541bfaba",
+      "06",
+      "d7347a5ea21a42f0fdb730de2963bf078433379b",
+      "",
+      "da11981104beaa87550b47301445df3e9f55c49b",
+      "",
+      "0ff9d78b7ca53b2f57d012c59855adb4eb3bf4bd",
+      "0e",
+      "72e8eb057dd30e0d8941c216e854d9eacfc6f5df",
+      "04"
+    ],
+    "signature": [
+      "4f602ff3d069de73734fca95e3ac35d45d858a5d09",
+      "dc5a779b5bd4da0f2f9fc115abf51aa591c163440a",
+      "1da7a5a219acf9d3ab601626851da3efd1b6bf6d06",
+      "8d83a283a9822524c7038e378e0e65b5f00a11f00f",
+      "4f4d53d7b5abedd16b6f1affdea983fb00f3b60c0b",
+      "902548ff1fbd8f9520a944980a4b1aeab4c18b8d06",
+      "2fc71c8fd5e7475c1bb4b56a0333a6d626822d8505",
+      "dc61315bc4bdfbfc71576543e521423b0432d02904",
+      "cbea78abc172d9671d78c546977de0cc96bde6b40f",
+      "a5b69f6f730bdd545f787a817faad4a890d8875706",
+      "75ff48fc0c7c3eebf97f425d4f82e6fb85aa45850e",
+      "78cc79b12ab240c22aa4ad296c3e45a9617499d808",
+      "68d1d8eaf483f19cf1efe385ee8540bbae8b291b03",
+      "6c564853ac2bd072635c2fd8e34d4f326499f6b90c",
+      "eda0eade826a8e4dc671b5a608759094608b3a8909",
+      "1bc6bc3f6fb30034e9192a7cbb5cae68a03fd71b0b",
+      "13bc0a95f7238cb06df77e573a4aca24c6d0da1a0e",
+      "e592a6da7652dcbeb82b06e726a615965599c44f0c",
+      "39552b2f52fb64dcbbb68d3b0a650317b9173a8503",
+      "b0efd468b55af5270ad3b0c3f8f0e9d8d8b0ac3c07",
+      "d1b899dda93c19ffb42e221490e2432a149e898f0c",
+      "d95ce420df7b2e97de4606f41bbfb9b14022b7910d",
+      "c17157694ea7dc1606785708224b2b8e056f63fe0e",
+      "0d8918db16903706a1182855d18dab3d34276b8801",
+      "37bc77348d08bef8edf5f202a4341217671e1aee02",
+      "2059797f883326b981ed9c94b5960a4a1f146a8603",
+      "ed4ebc72a1d3babab9ae588d9ce521978d6a511503",
+      "f6c03eec9cbb0cc8032e71a033d074a6e4ecca5f04",
+      "072f0411a9eb3367d22fd53f392035ad3bf82b400c",
+      "22ab52cf209fb45bd37425ec31a87d5a1284862202",
+      "de3fac0f1485d62c53a1625273e23b89541bfaba06",
+      "d7347a5ea21a42f0fdb730de2963bf078433379b00",
+      "da11981104beaa87550b47301445df3e9f55c49b00",
+      "0ff9d78b7ca53b2f57d012c59855adb4eb3bf4bd0e",
+      "72e8eb057dd30e0d8941c216e854d9eacfc6f5df04"
+    ],
+    "compact_witness": [
+      "4f602ff3d069de73734fca95e3ac35d45d858a5d",
+      "dc5a779b5bd4da0f2f9fc115abf51aa591c16344",
+      "1da7a5a219acf9d3ab601626851da3efd1b6bf6d",
+      "8d83a283a9822524c7038e378e0e65b5f00a11f0",
+      "4f4d53d7b5abedd16b6f1affdea983fb00f3b60c",
+      "902548ff1fbd8f9520a944980a4b1aeab4c18b8d",
+      "2fc71c8fd5e7475c1bb4b56a0333a6d626822d85",
+      "dc61315bc4bdfbfc71576543e521423b0432d029",
+      "cbea78abc172d9671d78c546977de0cc96bde6b4",
+      "a5b69f6f730bdd545f787a817faad4a890d88757",
+      "75ff48fc0c7c3eebf97f425d4f82e6fb85aa4585",
+      "78cc79b12ab240c22aa4ad296c3e45a9617499d8",
+      "68d1d8eaf483f19cf1efe385ee8540bbae8b291b",
+      "6c564853ac2bd072635c2fd8e34d4f326499f6b9",
+      "eda0eade826a8e4dc671b5a608759094608b3a89",
+      "1bc6bc3f6fb30034e9192a7cbb5cae68a03fd71b",
+      "13bc0a95f7238cb06df77e573a4aca24c6d0da1a",
+      "e592a6da7652dcbeb82b06e726a615965599c44f",
+      "39552b2f52fb64dcbbb68d3b0a650317b9173a85",
+      "b0efd468b55af5270ad3b0c3f8f0e9d8d8b0ac3c",
+      "d1b899dda93c19ffb42e221490e2432a149e898f",
+      "d95ce420df7b2e97de4606f41bbfb9b14022b791",
+      "c17157694ea7dc1606785708224b2b8e056f63fe",
+      "0d8918db16903706a1182855d18dab3d34276b88",
+      "37bc77348d08bef8edf5f202a4341217671e1aee",
+      "2059797f883326b981ed9c94b5960a4a1f146a86",
+      "ed4ebc72a1d3babab9ae588d9ce521978d6a5115",
+      "f6c03eec9cbb0cc8032e71a033d074a6e4ecca5f",
+      "072f0411a9eb3367d22fd53f392035ad3bf82b40",
+      "22ab52cf209fb45bd37425ec31a87d5a12848622",
+      "de3fac0f1485d62c53a1625273e23b89541bfaba",
+      "d7347a5ea21a42f0fdb730de2963bf078433379b",
+      "da11981104beaa87550b47301445df3e9f55c49b",
+      "0ff9d78b7ca53b2f57d012c59855adb4eb3bf4bd",
+      "72e8eb057dd30e0d8941c216e854d9eacfc6f5df"
+    ],
+    "compact_signature": [
+      "4f602ff3d069de73734fca95e3ac35d45d858a5d",
+      "dc5a779b5bd4da0f2f9fc115abf51aa591c16344",
+      "1da7a5a219acf9d3ab601626851da3efd1b6bf6d",
+      "8d83a283a9822524c7038e378e0e65b5f00a11f0",
+      "4f4d53d7b5abedd16b6f1affdea983fb00f3b60c",
+      "902548ff1fbd8f9520a944980a4b1aeab4c18b8d",
+      "2fc71c8fd5e7475c1bb4b56a0333a6d626822d85",
+      "dc61315bc4bdfbfc71576543e521423b0432d029",
+      "cbea78abc172d9671d78c546977de0cc96bde6b4",
+      "a5b69f6f730bdd545f787a817faad4a890d88757",
+      "75ff48fc0c7c3eebf97f425d4f82e6fb85aa4585",
+      "78cc79b12ab240c22aa4ad296c3e45a9617499d8",
+      "68d1d8eaf483f19cf1efe385ee8540bbae8b291b",
+      "6c564853ac2bd072635c2fd8e34d4f326499f6b9",
+      "eda0eade826a8e4dc671b5a608759094608b3a89",
+      "1bc6bc3f6fb30034e9192a7cbb5cae68a03fd71b",
+      "13bc0a95f7238cb06df77e573a4aca24c6d0da1a",
+      "e592a6da7652dcbeb82b06e726a615965599c44f",
+      "39552b2f52fb64dcbbb68d3b0a650317b9173a85",
+      "b0efd468b55af5270ad3b0c3f8f0e9d8d8b0ac3c",
+      "d1b899dda93c19ffb42e221490e2432a149e898f",
+      "d95ce420df7b2e97de4606f41bbfb9b14022b791",
+      "c17157694ea7dc1606785708224b2b8e056f63fe",
+      "0d8918db16903706a1182855d18dab3d34276b88",
+      "37bc77348d08bef8edf5f202a4341217671e1aee",
+      "2059797f883326b981ed9c94b5960a4a1f146a86",
+      "ed4ebc72a1d3babab9ae588d9ce521978d6a5115",
+      "f6c03eec9cbb0cc8032e71a033d074a6e4ecca5f",
+      "072f0411a9eb3367d22fd53f392035ad3bf82b40",
+      "22ab52cf209fb45bd37425ec31a87d5a12848622",
+      "de3fac0f1485d62c53a1625273e23b89541bfaba",
+      "d7347a5ea21a42f0fdb730de2963bf078433379b",
+      "da11981104beaa87550b47301445df3e9f55c49b",
+      "0ff9d78b7ca53b2f57d012c59855adb4eb3bf4bd",
+      "72e8eb057dd30e0d8941c216e854d9eacfc6f5df"
+    ]
+  },
+  {
+    "message": "0000000000000000ffffffffffffffff",
+    "secretKey": "ead35045183fa2bcf91d326f7c128a902b51a12d",
+    "publicKey": [
+      "52303ae9e9d56e7b6678baa77bdc7bce0eda65b6",
+      "d536e0e8573e10f907ef2ee3536af9c695585010",
+      "be2aaa6a34c81d1c2b0850da06a6663df35ef4fe",
+      "488c2190efe74b53ac5ea31cb9d81c8e0f729c59",
+      "b118e1638bf35f3d90d81a40cb5b55dd80692cbb",
+      "77af0b634ecc386923a7e06106a9fc2fa240a833",
+      "aa6547af5247df77cbbd903fa3757edfea310b6b",
+      "516a7bcd44b52e63ab40b579cdf5c241385eaec7",
+      "c192b3ea1ca34011bae6f0d6a9e6181a1cbc7c18",
+      "b028035edd8625f93cd6f7131d7481e15e3be832",
+      "e9a6217eb2e8d63fec00998b65b004a0e00c8e46",
+      "d642012587c5fdbc14d454afaf4e3405cc0dbd8d",
+      "1f7e39b86e547c09bcb5b970c0b619128669b7b2",
+      "0883ac5ea65f42bdce443225d8e0d939080ab3cf",
+      "3aa9141149b319df4c69f8dd3d26e5cb9779051e",
+      "683ce0cca2d1429fa074f226b8890bbaf137efcd",
+      "99d99c79d7b2de80878555f20cf13f001c0ab33e",
+      "322c33fec6d3ec4fa428eea4b3e9897a6d23eb93",
+      "187ae73bf021a6bb6fa6bc8c17b7068e6229ce1e",
+      "5d6925df8a443f93d3c7aa90a37f17decb3836ce",
+      "063c54242e4aafd6820dfbd2b5581bdbe1006891",
+      "f64b3cb6f0ca4bc9c5532a350a148daf556bc0bd",
+      "59bc543734c33d49ba72c10f7a9d5576220c7c5b",
+      "30d91f1a3659a91084d6282fa01d915b80331ed9",
+      "73887aa5d56a2a37084789bc8b557a5cdcc8c7a2",
+      "1c2d407cf10ae1018dfbe05c0bafcf0ffa0185a5",
+      "8e438f588f8f66aa337c26b337ca37bcde5a2dbe",
+      "bbe43e459ae665bbe5770ec7c34bdcf4b25b8da7",
+      "f71f85a4cbe1e707a941a63ea2de3333a4276db7",
+      "17e3da3f2ba3bd601f2e1a82b60fd736bcc6f688",
+      "fdc171cf25c0102c8a02ee896cf6d98b20da5869",
+      "9ef20db5caf442c53e9dd1ba53ff679f5bcdaa73",
+      "436a57205a4ec8a51d8c96b863784f10fb20ff59",
+      "400a250844f980139220c06e80429ffe91859179",
+      "8b6e717aa3de85f6ba8b24cab7d734b7422ac137"
+    ],
+    "witness": [
+      "52303ae9e9d56e7b6678baa77bdc7bce0eda65b6",
+      "0f",
+      "d536e0e8573e10f907ef2ee3536af9c695585010",
+      "0f",
+      "be2aaa6a34c81d1c2b0850da06a6663df35ef4fe",
+      "0f",
+      "488c2190efe74b53ac5ea31cb9d81c8e0f729c59",
+      "0f",
+      "b118e1638bf35f3d90d81a40cb5b55dd80692cbb",
+      "0f",
+      "77af0b634ecc386923a7e06106a9fc2fa240a833",
+      "0f",
+      "aa6547af5247df77cbbd903fa3757edfea310b6b",
+      "0f",
+      "516a7bcd44b52e63ab40b579cdf5c241385eaec7",
+      "0f",
+      "c192b3ea1ca34011bae6f0d6a9e6181a1cbc7c18",
+      "0f",
+      "b028035edd8625f93cd6f7131d7481e15e3be832",
+      "0f",
+      "e9a6217eb2e8d63fec00998b65b004a0e00c8e46",
+      "0f",
+      "d642012587c5fdbc14d454afaf4e3405cc0dbd8d",
+      "0f",
+      "1f7e39b86e547c09bcb5b970c0b619128669b7b2",
+      "0f",
+      "0883ac5ea65f42bdce443225d8e0d939080ab3cf",
+      "0f",
+      "3aa9141149b319df4c69f8dd3d26e5cb9779051e",
+      "0f",
+      "683ce0cca2d1429fa074f226b8890bbaf137efcd",
+      "0f",
+      "112c0667fcafe9011f7f46a5469bc1fef566348c",
+      "",
+      "095fe5896d17edf42afbc3b17448ae8aa063ddf8",
+      "",
+      "9c16bf9b4dd7ee70527ec1120962b024fcf580f1",
+      "",
+      "51ef4cc18a1423179ae921e4cdd0bd962c8019e1",
+      "",
+      "f670f501bb2588a3b85f4181c4fdb193f9a6939c",
+      "",
+      "801421ea2bc8afe002eb2434f82d9d64862fe3cf",
+      "",
+      "eae05b91a7dac35b4f6f85323fcec459a4bf5a22",
+      "",
+      "8febde134ffbc8024451e4f3e28cfab554d5cc42",
+      "",
+      "51091385213f5bc1af15a5b8ab67890dc2b8ee8f",
+      "",
+      "b3e91a4ed25e606d4b5d4ad9b4a2163cd8ea43f4",
+      "",
+      "e17d2512766d88dd03858403d62b5eb6009653e2",
+      "",
+      "683bdd50cf0cf8dcb2ee43c6911d2808b2c97cfe",
+      "",
+      "7864dabc192892af0d87916026f8d0fa2852992d",
+      "",
+      "e6cffa6beda0aa76c023f09492ba25e449249432",
+      "",
+      "42c56a9b0604d4d7a7bbaf7855963b8338a92fd3",
+      "",
+      "9e135cfcddb0c54f02eb603121fa580b0bacfb8c",
+      "",
+      "6a139e0727827c85839f0437b286df282e1fe9a9",
+      "",
+      "400a250844f980139220c06e80429ffe91859179",
+      "0f",
+      "facbd52c59c071e0c937c161e121e46b50d65e65",
+      ""
+    ],
+    "signature": [
+      "52303ae9e9d56e7b6678baa77bdc7bce0eda65b60f",
+      "d536e0e8573e10f907ef2ee3536af9c6955850100f",
+      "be2aaa6a34c81d1c2b0850da06a6663df35ef4fe0f",
+      "488c2190efe74b53ac5ea31cb9d81c8e0f729c590f",
+      "b118e1638bf35f3d90d81a40cb5b55dd80692cbb0f",
+      "77af0b634ecc386923a7e06106a9fc2fa240a8330f",
+      "aa6547af5247df77cbbd903fa3757edfea310b6b0f",
+      "516a7bcd44b52e63ab40b579cdf5c241385eaec70f",
+      "c192b3ea1ca34011bae6f0d6a9e6181a1cbc7c180f",
+      "b028035edd8625f93cd6f7131d7481e15e3be8320f",
+      "e9a6217eb2e8d63fec00998b65b004a0e00c8e460f",
+      "d642012587c5fdbc14d454afaf4e3405cc0dbd8d0f",
+      "1f7e39b86e547c09bcb5b970c0b619128669b7b20f",
+      "0883ac5ea65f42bdce443225d8e0d939080ab3cf0f",
+      "3aa9141149b319df4c69f8dd3d26e5cb9779051e0f",
+      "683ce0cca2d1429fa074f226b8890bbaf137efcd0f",
+      "112c0667fcafe9011f7f46a5469bc1fef566348c00",
+      "095fe5896d17edf42afbc3b17448ae8aa063ddf800",
+      "9c16bf9b4dd7ee70527ec1120962b024fcf580f100",
+      "51ef4cc18a1423179ae921e4cdd0bd962c8019e100",
+      "f670f501bb2588a3b85f4181c4fdb193f9a6939c00",
+      "801421ea2bc8afe002eb2434f82d9d64862fe3cf00",
+      "eae05b91a7dac35b4f6f85323fcec459a4bf5a2200",
+      "8febde134ffbc8024451e4f3e28cfab554d5cc4200",
+      "51091385213f5bc1af15a5b8ab67890dc2b8ee8f00",
+      "b3e91a4ed25e606d4b5d4ad9b4a2163cd8ea43f400",
+      "e17d2512766d88dd03858403d62b5eb6009653e200",
+      "683bdd50cf0cf8dcb2ee43c6911d2808b2c97cfe00",
+      "7864dabc192892af0d87916026f8d0fa2852992d00",
+      "e6cffa6beda0aa76c023f09492ba25e44924943200",
+      "42c56a9b0604d4d7a7bbaf7855963b8338a92fd300",
+      "9e135cfcddb0c54f02eb603121fa580b0bacfb8c00",
+      "6a139e0727827c85839f0437b286df282e1fe9a900",
+      "400a250844f980139220c06e80429ffe918591790f",
+      "facbd52c59c071e0c937c161e121e46b50d65e6500"
+    ],
+    "compact_witness": [
+      "52303ae9e9d56e7b6678baa77bdc7bce0eda65b6",
+      "d536e0e8573e10f907ef2ee3536af9c695585010",
+      "be2aaa6a34c81d1c2b0850da06a6663df35ef4fe",
+      "488c2190efe74b53ac5ea31cb9d81c8e0f729c59",
+      "b118e1638bf35f3d90d81a40cb5b55dd80692cbb",
+      "77af0b634ecc386923a7e06106a9fc2fa240a833",
+      "aa6547af5247df77cbbd903fa3757edfea310b6b",
+      "516a7bcd44b52e63ab40b579cdf5c241385eaec7",
+      "c192b3ea1ca34011bae6f0d6a9e6181a1cbc7c18",
+      "b028035edd8625f93cd6f7131d7481e15e3be832",
+      "e9a6217eb2e8d63fec00998b65b004a0e00c8e46",
+      "d642012587c5fdbc14d454afaf4e3405cc0dbd8d",
+      "1f7e39b86e547c09bcb5b970c0b619128669b7b2",
+      "0883ac5ea65f42bdce443225d8e0d939080ab3cf",
+      "3aa9141149b319df4c69f8dd3d26e5cb9779051e",
+      "683ce0cca2d1429fa074f226b8890bbaf137efcd",
+      "112c0667fcafe9011f7f46a5469bc1fef566348c",
+      "095fe5896d17edf42afbc3b17448ae8aa063ddf8",
+      "9c16bf9b4dd7ee70527ec1120962b024fcf580f1",
+      "51ef4cc18a1423179ae921e4cdd0bd962c8019e1",
+      "f670f501bb2588a3b85f4181c4fdb193f9a6939c",
+      "801421ea2bc8afe002eb2434f82d9d64862fe3cf",
+      "eae05b91a7dac35b4f6f85323fcec459a4bf5a22",
+      "8febde134ffbc8024451e4f3e28cfab554d5cc42",
+      "51091385213f5bc1af15a5b8ab67890dc2b8ee8f",
+      "b3e91a4ed25e606d4b5d4ad9b4a2163cd8ea43f4",
+      "e17d2512766d88dd03858403d62b5eb6009653e2",
+      "683bdd50cf0cf8dcb2ee43c6911d2808b2c97cfe",
+      "7864dabc192892af0d87916026f8d0fa2852992d",
+      "e6cffa6beda0aa76c023f09492ba25e449249432",
+      "42c56a9b0604d4d7a7bbaf7855963b8338a92fd3",
+      "9e135cfcddb0c54f02eb603121fa580b0bacfb8c",
+      "6a139e0727827c85839f0437b286df282e1fe9a9",
+      "400a250844f980139220c06e80429ffe91859179",
+      "facbd52c59c071e0c937c161e121e46b50d65e65"
+    ],
+    "compact_signature": [
+      "52303ae9e9d56e7b6678baa77bdc7bce0eda65b6",
+      "d536e0e8573e10f907ef2ee3536af9c695585010",
+      "be2aaa6a34c81d1c2b0850da06a6663df35ef4fe",
+      "488c2190efe74b53ac5ea31cb9d81c8e0f729c59",
+      "b118e1638bf35f3d90d81a40cb5b55dd80692cbb",
+      "77af0b634ecc386923a7e06106a9fc2fa240a833",
+      "aa6547af5247df77cbbd903fa3757edfea310b6b",
+      "516a7bcd44b52e63ab40b579cdf5c241385eaec7",
+      "c192b3ea1ca34011bae6f0d6a9e6181a1cbc7c18",
+      "b028035edd8625f93cd6f7131d7481e15e3be832",
+      "e9a6217eb2e8d63fec00998b65b004a0e00c8e46",
+      "d642012587c5fdbc14d454afaf4e3405cc0dbd8d",
+      "1f7e39b86e547c09bcb5b970c0b619128669b7b2",
+      "0883ac5ea65f42bdce443225d8e0d939080ab3cf",
+      "3aa9141149b319df4c69f8dd3d26e5cb9779051e",
+      "683ce0cca2d1429fa074f226b8890bbaf137efcd",
+      "112c0667fcafe9011f7f46a5469bc1fef566348c",
+      "095fe5896d17edf42afbc3b17448ae8aa063ddf8",
+      "9c16bf9b4dd7ee70527ec1120962b024fcf580f1",
+      "51ef4cc18a1423179ae921e4cdd0bd962c8019e1",
+      "f670f501bb2588a3b85f4181c4fdb193f9a6939c",
+      "801421ea2bc8afe002eb2434f82d9d64862fe3cf",
+      "eae05b91a7dac35b4f6f85323fcec459a4bf5a22",
+      "8febde134ffbc8024451e4f3e28cfab554d5cc42",
+      "51091385213f5bc1af15a5b8ab67890dc2b8ee8f",
+      "b3e91a4ed25e606d4b5d4ad9b4a2163cd8ea43f4",
+      "e17d2512766d88dd03858403d62b5eb6009653e2",
+      "683bdd50cf0cf8dcb2ee43c6911d2808b2c97cfe",
+      "7864dabc192892af0d87916026f8d0fa2852992d",
+      "e6cffa6beda0aa76c023f09492ba25e449249432",
+      "42c56a9b0604d4d7a7bbaf7855963b8338a92fd3",
+      "9e135cfcddb0c54f02eb603121fa580b0bacfb8c",
+      "6a139e0727827c85839f0437b286df282e1fe9a9",
+      "400a250844f980139220c06e80429ffe91859179",
+      "facbd52c59c071e0c937c161e121e46b50d65e65"
+    ]
+  },
+  {
+    "message": "0000000000ffffffffff9a111fc9dd17",
+    "secretKey": "d5f057743ade3824f923b94e5d16e62e5ecfd788",
+    "publicKey": [
+      "5142cedd26725c4de85bc9c97b46193d1f7c9682",
+      "5753ff3e7ba4d8ce8f04a46e5084ef7a149894e3",
+      "0018eb33f073464e33614eab7361076b2ae31c01",
+      "eb99f5eb3abc68145da992c397431548f4fb40d0",
+      "b4e244e1283c3bc1792a289717e551033d2c27a4",
+      "73a3bf522f4fadda5d314ec5ee8cf64719bf821c",
+      "f6f471230a9808d21708e18c33ae7ec8969b30ac",
+      "7c4dbc75f425af74ef234d65844e86ed78c05d21",
+      "9140edb6d9a587408302fb262b1b204fe44c7434",
+      "aae61795a38cab3865ef360da90d99fd72d27f54",
+      "0b8a77319bd2430d98274f21e646ad3d64cf6d8c",
+      "27fe399a6e2392ecddc09c8cf2f022570b4c21db",
+      "cc14c06d13091a85854238b31470f58b7dd2ae27",
+      "fb92037ef2f4eee438b908990db6d231d3359539",
+      "9903bdd787e8d0008aa750e913e82777e8c0fa67",
+      "55c7a005bf9682c6c14e83dcdd9c0a6b02899d22",
+      "0ef514d5eabea3eaf93199fdf57ef80c40a768c4",
+      "4c132ac49c4585cc9434c449ff898e73c0c2d91b",
+      "eb09a3b320821cdf65f4b00e51c8536b710d700d",
+      "aca5621817a0d9c897fe68eb69b838516420f94b",
+      "4854bfe8f1f275c9c69c5e25f796cd5b3ea70566",
+      "24639c1d68e8eafbec49eda409d95df1b53f8f93",
+      "5fe815c54efbc439974bacab7af7536ba897f76f",
+      "6f000c19d68004bd13cf8f9ec91a17d29e7d0dec",
+      "af32ed52017a287df26e64fd28264c0b47718661",
+      "b78d6e1b24a7176d41a8949ad5ee6454711b9096",
+      "3b5b2a4e0b2d42e618004ad4588fcf56f37af7d5",
+      "86c0d1c860c1d5b44a2683cbaa5991a3943e24e5",
+      "1f23c003d6c84b45cbbcab0baa162669d145a2f6",
+      "a45dd07f48f08b1a08cc1747da35e042ead74b93",
+      "56a3b84df18e1e946588b15f0cf44218aeb223d0",
+      "6364eaf337c0558053d75e0344cee2051064ab9e",
+      "cd07c11887c4a90376a7bd806bc9dab09f58e87a",
+      "c13a46db8128de173bc076f851aa5a1538d4a2d6",
+      "8b2de26b4d18d3750a0f6098d98c57a157b0bc51"
+    ],
+    "witness": [
+      "0479972dc1a34f367826775e5b19250ab84076fd",
+      "01",
+      "eb9e995db2bb590204bdb5a4c1d58bdee390b019",
+      "07",
+      "6ad0513261573a49374dd1d878b376e4d1c63f05",
+      "0d",
+      "a0fa273a5aed064811fa6b45c94f9c334ed87e7d",
+      "0d",
+      "99899ba15bb774be75b7b611cca2db92eb0d3fba",
+      "0c",
+      "0ed90c75db34c5ff07be0993902934c290fa2dc9",
+      "09",
+      "10315e7635a3e64891ebcc4962bd3b488e291604",
+      "01",
+      "7c4dbc75f425af74ef234d65844e86ed78c05d21",
+      "0f",
+      "042042f3bf555ddacb1ba3840ab22b2484f3cb2f",
+      "01",
+      "adf3b417cae604554e110c824de05de5bc9b521c",
+      "01",
+      "b966e022ab4c7a0b4b522cc494b3eb16df13da7c",
+      "09",
+      "5a8caa271efbd4a1abd5f130177bfc7d13957a51",
+      "0a",
+      "cc14c06d13091a85854238b31470f58b7dd2ae27",
+      "0f",
+      "fb92037ef2f4eee438b908990db6d231d3359539",
+      "0f",
+      "9903bdd787e8d0008aa750e913e82777e8c0fa67",
+      "0f",
+      "55c7a005bf9682c6c14e83dcdd9c0a6b02899d22",
+      "0f",
+      "0ef514d5eabea3eaf93199fdf57ef80c40a768c4",
+      "0f",
+      "4c132ac49c4585cc9434c449ff898e73c0c2d91b",
+      "0f",
+      "eb09a3b320821cdf65f4b00e51c8536b710d700d",
+      "0f",
+      "aca5621817a0d9c897fe68eb69b838516420f94b",
+      "0f",
+      "4854bfe8f1f275c9c69c5e25f796cd5b3ea70566",
+      "0f",
+      "24639c1d68e8eafbec49eda409d95df1b53f8f93",
+      "0f",
+      "0c9a77660e40b7ce9ad30e03755f931b9a2b9d9c",
+      "",
+      "500b1b5d358efe8dc661ff1b77078ffab111659e",
+      "",
+      "89cbbae55ce887995dd35d891e9e160fbae7a344",
+      "",
+      "17cdc2107bbea8067914006a7a167dbc9e19ac62",
+      "",
+      "66cb1a56e3a34855546d9a8e960d76048fc57102",
+      "",
+      "d8fd2e61eb319885dfd813f6ab8bfccf91f7bb20",
+      "",
+      "fa6e86c5c3084d7778df9b447b7f2e244cdd584b",
+      "",
+      "864bb2e53ebf15f84d2d831471f7430225d8ab48",
+      "",
+      "6600a72ada07e7b1c2f3dd682d5a33945651bf6d",
+      "",
+      "7560da1957b5408295473b928a59463fde9f72ff",
+      "",
+      "616c54158445adfe9a910530b7b44ae1d2bdcb71",
+      "",
+      "8ca5a05677bf0a02a08f57011a6dcb81a48a988f",
+      "0e",
+      "a7703dbe654b7da36243d9e5154e8992b24fa47f",
+      "0e"
+    ],
+    "signature": [
+      "0479972dc1a34f367826775e5b19250ab84076fd01",
+      "eb9e995db2bb590204bdb5a4c1d58bdee390b01907",
+      "6ad0513261573a49374dd1d878b376e4d1c63f050d",
+      "a0fa273a5aed064811fa6b45c94f9c334ed87e7d0d",
+      "99899ba15bb774be75b7b611cca2db92eb0d3fba0c",
+      "0ed90c75db34c5ff07be0993902934c290fa2dc909",
+      "10315e7635a3e64891ebcc4962bd3b488e29160401",
+      "7c4dbc75f425af74ef234d65844e86ed78c05d210f",
+      "042042f3bf555ddacb1ba3840ab22b2484f3cb2f01",
+      "adf3b417cae604554e110c824de05de5bc9b521c01",
+      "b966e022ab4c7a0b4b522cc494b3eb16df13da7c09",
+      "5a8caa271efbd4a1abd5f130177bfc7d13957a510a",
+      "cc14c06d13091a85854238b31470f58b7dd2ae270f",
+      "fb92037ef2f4eee438b908990db6d231d33595390f",
+      "9903bdd787e8d0008aa750e913e82777e8c0fa670f",
+      "55c7a005bf9682c6c14e83dcdd9c0a6b02899d220f",
+      "0ef514d5eabea3eaf93199fdf57ef80c40a768c40f",
+      "4c132ac49c4585cc9434c449ff898e73c0c2d91b0f",
+      "eb09a3b320821cdf65f4b00e51c8536b710d700d0f",
+      "aca5621817a0d9c897fe68eb69b838516420f94b0f",
+      "4854bfe8f1f275c9c69c5e25f796cd5b3ea705660f",
+      "24639c1d68e8eafbec49eda409d95df1b53f8f930f",
+      "0c9a77660e40b7ce9ad30e03755f931b9a2b9d9c00",
+      "500b1b5d358efe8dc661ff1b77078ffab111659e00",
+      "89cbbae55ce887995dd35d891e9e160fbae7a34400",
+      "17cdc2107bbea8067914006a7a167dbc9e19ac6200",
+      "66cb1a56e3a34855546d9a8e960d76048fc5710200",
+      "d8fd2e61eb319885dfd813f6ab8bfccf91f7bb2000",
+      "fa6e86c5c3084d7778df9b447b7f2e244cdd584b00",
+      "864bb2e53ebf15f84d2d831471f7430225d8ab4800",
+      "6600a72ada07e7b1c2f3dd682d5a33945651bf6d00",
+      "7560da1957b5408295473b928a59463fde9f72ff00",
+      "616c54158445adfe9a910530b7b44ae1d2bdcb7100",
+      "8ca5a05677bf0a02a08f57011a6dcb81a48a988f0e",
+      "a7703dbe654b7da36243d9e5154e8992b24fa47f0e"
+    ],
+    "compact_witness": [
+      "0479972dc1a34f367826775e5b19250ab84076fd",
+      "eb9e995db2bb590204bdb5a4c1d58bdee390b019",
+      "6ad0513261573a49374dd1d878b376e4d1c63f05",
+      "a0fa273a5aed064811fa6b45c94f9c334ed87e7d",
+      "99899ba15bb774be75b7b611cca2db92eb0d3fba",
+      "0ed90c75db34c5ff07be0993902934c290fa2dc9",
+      "10315e7635a3e64891ebcc4962bd3b488e291604",
+      "7c4dbc75f425af74ef234d65844e86ed78c05d21",
+      "042042f3bf555ddacb1ba3840ab22b2484f3cb2f",
+      "adf3b417cae604554e110c824de05de5bc9b521c",
+      "b966e022ab4c7a0b4b522cc494b3eb16df13da7c",
+      "5a8caa271efbd4a1abd5f130177bfc7d13957a51",
+      "cc14c06d13091a85854238b31470f58b7dd2ae27",
+      "fb92037ef2f4eee438b908990db6d231d3359539",
+      "9903bdd787e8d0008aa750e913e82777e8c0fa67",
+      "55c7a005bf9682c6c14e83dcdd9c0a6b02899d22",
+      "0ef514d5eabea3eaf93199fdf57ef80c40a768c4",
+      "4c132ac49c4585cc9434c449ff898e73c0c2d91b",
+      "eb09a3b320821cdf65f4b00e51c8536b710d700d",
+      "aca5621817a0d9c897fe68eb69b838516420f94b",
+      "4854bfe8f1f275c9c69c5e25f796cd5b3ea70566",
+      "24639c1d68e8eafbec49eda409d95df1b53f8f93",
+      "0c9a77660e40b7ce9ad30e03755f931b9a2b9d9c",
+      "500b1b5d358efe8dc661ff1b77078ffab111659e",
+      "89cbbae55ce887995dd35d891e9e160fbae7a344",
+      "17cdc2107bbea8067914006a7a167dbc9e19ac62",
+      "66cb1a56e3a34855546d9a8e960d76048fc57102",
+      "d8fd2e61eb319885dfd813f6ab8bfccf91f7bb20",
+      "fa6e86c5c3084d7778df9b447b7f2e244cdd584b",
+      "864bb2e53ebf15f84d2d831471f7430225d8ab48",
+      "6600a72ada07e7b1c2f3dd682d5a33945651bf6d",
+      "7560da1957b5408295473b928a59463fde9f72ff",
+      "616c54158445adfe9a910530b7b44ae1d2bdcb71",
+      "8ca5a05677bf0a02a08f57011a6dcb81a48a988f",
+      "a7703dbe654b7da36243d9e5154e8992b24fa47f"
+    ],
+    "compact_signature": [
+      "0479972dc1a34f367826775e5b19250ab84076fd",
+      "eb9e995db2bb590204bdb5a4c1d58bdee390b019",
+      "6ad0513261573a49374dd1d878b376e4d1c63f05",
+      "a0fa273a5aed064811fa6b45c94f9c334ed87e7d",
+      "99899ba15bb774be75b7b611cca2db92eb0d3fba",
+      "0ed90c75db34c5ff07be0993902934c290fa2dc9",
+      "10315e7635a3e64891ebcc4962bd3b488e291604",
+      "7c4dbc75f425af74ef234d65844e86ed78c05d21",
+      "042042f3bf555ddacb1ba3840ab22b2484f3cb2f",
+      "adf3b417cae604554e110c824de05de5bc9b521c",
+      "b966e022ab4c7a0b4b522cc494b3eb16df13da7c",
+      "5a8caa271efbd4a1abd5f130177bfc7d13957a51",
+      "cc14c06d13091a85854238b31470f58b7dd2ae27",
+      "fb92037ef2f4eee438b908990db6d231d3359539",
+      "9903bdd787e8d0008aa750e913e82777e8c0fa67",
+      "55c7a005bf9682c6c14e83dcdd9c0a6b02899d22",
+      "0ef514d5eabea3eaf93199fdf57ef80c40a768c4",
+      "4c132ac49c4585cc9434c449ff898e73c0c2d91b",
+      "eb09a3b320821cdf65f4b00e51c8536b710d700d",
+      "aca5621817a0d9c897fe68eb69b838516420f94b",
+      "4854bfe8f1f275c9c69c5e25f796cd5b3ea70566",
+      "24639c1d68e8eafbec49eda409d95df1b53f8f93",
+      "0c9a77660e40b7ce9ad30e03755f931b9a2b9d9c",
+      "500b1b5d358efe8dc661ff1b77078ffab111659e",
+      "89cbbae55ce887995dd35d891e9e160fbae7a344",
+      "17cdc2107bbea8067914006a7a167dbc9e19ac62",
+      "66cb1a56e3a34855546d9a8e960d76048fc57102",
+      "d8fd2e61eb319885dfd813f6ab8bfccf91f7bb20",
+      "fa6e86c5c3084d7778df9b447b7f2e244cdd584b",
+      "864bb2e53ebf15f84d2d831471f7430225d8ab48",
+      "6600a72ada07e7b1c2f3dd682d5a33945651bf6d",
+      "7560da1957b5408295473b928a59463fde9f72ff",
+      "616c54158445adfe9a910530b7b44ae1d2bdcb71",
+      "8ca5a05677bf0a02a08f57011a6dcb81a48a988f",
+      "a7703dbe654b7da36243d9e5154e8992b24fa47f"
+    ]
+  },
+  {
+    "message": "0000000000000000000000000000000000000000000000000000000000000000",
+    "secretKey": "b04468d3f9227ca1f3f6c6dce787564f7ef7b718",
+    "publicKey": [
+      "745c84cff6e82a37441524138648c7648039bfde",
+      "8b82cc42080d232e26bdd0daaeaa1fce5abe7e64",
+      "c611aac7406dc2c9ddd88107a2884e15fc643b5e",
+      "aff818f02bb4c48e62fe3c025d695f6897238a3d",
+      "0b8ca89228571c06b7f3d71c889354b45fba284c",
+      "41bf8b3a5b9c57a20de7a9c6dec92646a9acb36d",
+      "a2cea169695548fd540b3d0aef0c9353b8fc6c26",
+      "6202f8876015aa0df44d8161316448c683d4227f",
+      "1fa9430836c1ebb56a4b8ee6f5a577d56aa223aa",
+      "afa85b2ae794301b1f331eed648f181064b0017c",
+      "86f3b052f4d49cfa8b1932bd5a3aece4f012d923",
+      "470998465ac6a2e452b79ce027aed3c290d9f112",
+      "763936d0991e56fe852e3fd90cf93aad9e569438",
+      "7142242ab152b3d59e872c5ccc5c49fc3990997f",
+      "69c0f352f05e7de88d5c922bb4ac56f769825d98",
+      "576e543d3a59ecea04660c613936c6e4440620e8",
+      "f3d638dec02b15e7bc0758ec9174ca00d237e9cb",
+      "e6f7418201ec9e4aab5af929995a6d4c55fe8fea",
+      "71a2c8e5911f05b823ea5a8d6a45a247d9dfc5ce",
+      "def81ce3f550891851c7ef6b2aa5e300b632516a",
+      "22494d3258d6d3b69c697a2d549340bf04c574ea",
+      "3ad27823d9b71dff8116426f7f8300bfa1706fc5",
+      "3feb57ec458c026ba05a8716ddbcb4da61d08bbe",
+      "f46bbdbb4dd4da4695d652a455f0033614b8e65d",
+      "eccb40f42dd79117d5994a244bef639ad350a9c0",
+      "cbb4a9db672322ef8b0a26884e6ac856b4f63f2e",
+      "2be0d2112a939c6c2b94f9468595bc01687b2c77",
+      "e192a35effdb213967700b6763206038d68a88e9",
+      "0cbc38c459f31ece79734f0ac4f5286db797af4f",
+      "b9c831d76da964498069bf608f0e12c4a9f3c1f2",
+      "8fdada0076b6cfe56269e7de51eda496555ffea7",
+      "07ea6f8b75eaf7cf1bd1621be443a52c494ce175",
+      "ea367519b552c9ac46527616049a7648346ad90e",
+      "6932e8ae1ee9b2806585fa12d6faecd36fe0a1be",
+      "a693df13f1b3dcaf04cba098dc5e8f080331ddb1",
+      "d247f719e81f82f756786527cee4054e41c91bca",
+      "cee7d5cb42d820522f11b9ddbb95a56fc5c091d4",
+      "ca1bafa149d50ff2e0853e1492221c6a083fc25d",
+      "dce7f487a65f56f92fa68027c56d46b71afa9e69",
+      "038385ba097cf1d9e72ebaca4f5dd4e642f62fa7",
+      "12c52d94c8a6d0ae802307587c8c9710ccf3f8dc",
+      "c0798ba7920fc6ec5cc8514215527d5c7b55bfff",
+      "aeec7e234ed1c1fbf113cd6ccec1e260a615151d",
+      "bb70eaf770d735c4f16802bf5f8deccdc68dce16",
+      "cf8fddfe39680aef9bdebaaa6d24a546bed24699",
+      "43be66a0b57062b3e596418bc23eadb712c1599d",
+      "e97a3fbdad97061a142836480a0d7bc71250432a",
+      "3a9a7f704643b66a37cc01df7947c4e57d84cdd8",
+      "dd0fa526faae34f4c107a0fbbece342f359b0e23",
+      "ca5711d6f26f95c79c9f29da9953dd4c556ed37b",
+      "67e503181fd115ac1a2fea0bcdb096ab06dce650",
+      "1242bfd51e6b9000ca4c8d50a972f3e7e3730243",
+      "23d4b39da2d5cd5ad6296427153607348570572b",
+      "8d448d43dba2232de988a271b211c5bfb0f4d6be",
+      "4ce25a1314d5407cd43cbbb62ce235572d913bad",
+      "774218377aadbf63f2ae2a40d2cc53a2f471f5fd",
+      "453d8efe02ae53b96dd30781b1bebdd33c2ae6a8",
+      "38d305ee25fcb281682ed8090a547d1e3d0275f5",
+      "4be998f7ecfe4c17c32d3a63c87d97dbefd47bf8",
+      "6caf6a9e5b0fd18df120be0f2c8435dee544ee86",
+      "95c3f26180c02f14078aaa8ec8594f69df23f381",
+      "fdab8d6d9e4dbe477de57ef9ceb8767e6c207ec3",
+      "58109f5e40be94e7b32c00b1feeb441bfd87d6d5",
+      "77d86d377cc8bd64b9528e46284956d3f078a5f3",
+      "1e7fa2f821cf0627e71dd8900a22a216fe69c9c5",
+      "243d8ae944c111c623f368637969d7ccd40b50de",
+      "85483853bf0834673f68dce10cf93d90dcdff1a3"
+    ],
+    "witness": [
+      "55b79e1d5e1906d3c9bb65e699de26cf93e9eb29",
+      "",
+      "8022c40c43f774ec7ba247024f19a3c08b7f44a6",
+      "",
+      "c5821ada270036369d1931620ab0edf3695996dc",
+      "",
+      "69b7e6b8fb11b06641207c34765b267260434f2b",
+      "",
+      "538504e8ce9e04a2da92b2a89257f7a1733729dc",
+      "",
+      "f99e3bf2037de431e0727d185a9d3028f0ab7912",
+      "",
+      "a0b79eb4e1d08bee8b47b7e0d6ed9984c569b900",
+      "",
+      "760e61b512612cb30868a450333945a2dda96fdb",
+      "",
+      "d1698048a0565f077ea8e66f57af1e914829b367",
+      "",
+      "23a0032b31c3933ca025ee28fb334dbd0389d893",
+      "",
+      "ccbed33108248f2c3396590c0b34e7631a1b9ba0",
+      "",
+      "aa844a01a59851add3c9bb1e170b7c87d1020079",
+      "",
+      "4efac54e18814eba946e717ef67e9da71b16925e",
+      "",
+      "c773b991663073fdc7633873f66e6cef6f600011",
+      "",
+      "b455ca3ba53e831d2da6837940c4ee0244bef07c",
+      "",
+      "57e2e9e1c5e9d4703e0441caa9acff2ceea22912",
+      "",
+      "5b0b983b2be06693ff6dada3ce0fdedba20f9567",
+      "",
+      "d5d9383feb4d96b4a4ba4bfa5fa2c2ac55a85086",
+      "",
+      "0beea615637ffe6845b90d12ac7400397b1aac73",
+      "",
+      "2f7e8b318763e85966412a3b6496c8807dfaf2ce",
+      "",
+      "ebf849958c6a7a7d765aab6cc7629f802c6fc01f",
+      "",
+      "d409dbbe766ba99971cdcf9591ed21338ff2acdc",
+      "",
+      "a775fdb514c444befbb86983b1ca340341133653",
+      "",
+      "77e27d486df428a2480b3ca00b6c049c6e40f297",
+      "",
+      "e4b24b3fd6d991c9a1ad9aab4685b0f93e04270d",
+      "",
+      "452399b2a678ebcb8a2dc63518e65053c36c5653",
+      "",
+      "3a9deba089af6d0e276d1eb1c902b6a2451001f1",
+      "",
+      "b8aa5a58a5f27d22bf42cc458b5b8ace326e86c7",
+      "",
+      "c82fdbb80d848dd690ba82a32ee932528d425283",
+      "",
+      "5bcce007e7097eb5e0fbc6220f47389e17ca6e7a",
+      "",
+      "47e5fcbcea9ec63c64e89900b584f5da7aa86a17",
+      "",
+      "008452186d33273ad4912338f479c603770eb13d",
+      "",
+      "d2c27dd4cef9279e6852a7a1ef17f305fb6b213a",
+      "",
+      "598f1fba4ff42077bd9979d0d277fa18dd717c50",
+      "",
+      "4c7d73446b2588e094946f709d32ab4ad5648f25",
+      "",
+      "4fd35e64c6b970cf7093df64044d30036474a7d9",
+      "",
+      "4fe2df9a3b65958ad26d0fdb40f037283c9903fa",
+      "",
+      "47fca3edc3693272c3215478211519902483858f",
+      "",
+      "256999cf78a6e1b73147f6e50c9d7755e881c8f2",
+      "",
+      "874266cd8c0a2406eb6c8ce6571f0711c544b7ff",
+      "",
+      "0cc804f909e116e3f3d23b69184b9be43531503a",
+      "",
+      "8993e4826ad2f8c16c60c0d7203f630819d8e2e5",
+      "",
+      "5e6cd5b72caef5867c84992a90069867422fc98c",
+      "",
+      "9f8c4d8b7c2a9fa6404533ec2a2c94891113cf77",
+      "",
+      "d114f2df69691cb2ef9741bce020cb60ed8ce388",
+      "",
+      "554043131f070f0315c8512af74e89ecc31ec4b2",
+      "",
+      "247c751fc324f952208f5e7627b5b994881fdb47",
+      "",
+      "20b5b0b92b578dd98ac1bef682c24590a3dc8144",
+      "",
+      "62ec48ad054e62c2ccdacdd585e1553822b0bd98",
+      "",
+      "bd5f5abe751c8486ec560648adbe0eea25d7f6e6",
+      "",
+      "9a62b872f6a86a1431826991ba30d2d1df0836fe",
+      "",
+      "5724fd8842c744a2cecfd41c3b1f723fab0143c6",
+      "",
+      "e5af31df9636ce816f6398d7801b665f9e2afdff",
+      "",
+      "e440aaa85ee5c45211ea847f5e2b225480effdad",
+      "",
+      "c7356d4b5023558d6f1137c7ad7c0e972e3f30cc",
+      "",
+      "1b90c5500a855816ac08b417a373a3fcf0618634",
+      "",
+      "ca821a5852678932629a50a96a3d239911807b9a",
+      "",
+      "bbafd8b7c5992b97b3731f0acc0c3416c4ecfbd4",
+      "",
+      "7df3f6f7bbf2cd5869bc71617b9a0ec702efb985",
+      "",
+      "d5d87b95b84fbb37418ff63fb3c8a96ed244819b",
+      "",
+      "c9649296f950519c6348b05c9863c2fbf543f132",
+      "",
+      "feac4908467b770fd39c1474ec8a3cdf5fdd0134",
+      "",
+      "958e9c707a885041160ea0631c22f07090a370ed",
+      "",
+      "6528a1c191d26d83a5211ae501b76153c680736d",
+      "",
+      "a1d8602d21c46453ce23b084bdcafa1aeadcb272",
+      "03",
+      "a8114aa4ecf5ad5953553d551889c3e13056b7d9",
+      "0c",
+      "528a9a5882c3e445af3817d105fc4743a69ad788",
+      ""
+    ],
+    "signature": [
+      "55b79e1d5e1906d3c9bb65e699de26cf93e9eb2900",
+      "8022c40c43f774ec7ba247024f19a3c08b7f44a600",
+      "c5821ada270036369d1931620ab0edf3695996dc00",
+      "69b7e6b8fb11b06641207c34765b267260434f2b00",
+      "538504e8ce9e04a2da92b2a89257f7a1733729dc00",
+      "f99e3bf2037de431e0727d185a9d3028f0ab791200",
+      "a0b79eb4e1d08bee8b47b7e0d6ed9984c569b90000",
+      "760e61b512612cb30868a450333945a2dda96fdb00",
+      "d1698048a0565f077ea8e66f57af1e914829b36700",
+      "23a0032b31c3933ca025ee28fb334dbd0389d89300",
+      "ccbed33108248f2c3396590c0b34e7631a1b9ba000",
+      "aa844a01a59851add3c9bb1e170b7c87d102007900",
+      "4efac54e18814eba946e717ef67e9da71b16925e00",
+      "c773b991663073fdc7633873f66e6cef6f60001100",
+      "b455ca3ba53e831d2da6837940c4ee0244bef07c00",
+      "57e2e9e1c5e9d4703e0441caa9acff2ceea2291200",
+      "5b0b983b2be06693ff6dada3ce0fdedba20f956700",
+      "d5d9383feb4d96b4a4ba4bfa5fa2c2ac55a8508600",
+      "0beea615637ffe6845b90d12ac7400397b1aac7300",
+      "2f7e8b318763e85966412a3b6496c8807dfaf2ce00",
+      "ebf849958c6a7a7d765aab6cc7629f802c6fc01f00",
+      "d409dbbe766ba99971cdcf9591ed21338ff2acdc00",
+      "a775fdb514c444befbb86983b1ca34034113365300",
+      "77e27d486df428a2480b3ca00b6c049c6e40f29700",
+      "e4b24b3fd6d991c9a1ad9aab4685b0f93e04270d00",
+      "452399b2a678ebcb8a2dc63518e65053c36c565300",
+      "3a9deba089af6d0e276d1eb1c902b6a2451001f100",
+      "b8aa5a58a5f27d22bf42cc458b5b8ace326e86c700",
+      "c82fdbb80d848dd690ba82a32ee932528d42528300",
+      "5bcce007e7097eb5e0fbc6220f47389e17ca6e7a00",
+      "47e5fcbcea9ec63c64e89900b584f5da7aa86a1700",
+      "008452186d33273ad4912338f479c603770eb13d00",
+      "d2c27dd4cef9279e6852a7a1ef17f305fb6b213a00",
+      "598f1fba4ff42077bd9979d0d277fa18dd717c5000",
+      "4c7d73446b2588e094946f709d32ab4ad5648f2500",
+      "4fd35e64c6b970cf7093df64044d30036474a7d900",
+      "4fe2df9a3b65958ad26d0fdb40f037283c9903fa00",
+      "47fca3edc3693272c3215478211519902483858f00",
+      "256999cf78a6e1b73147f6e50c9d7755e881c8f200",
+      "874266cd8c0a2406eb6c8ce6571f0711c544b7ff00",
+      "0cc804f909e116e3f3d23b69184b9be43531503a00",
+      "8993e4826ad2f8c16c60c0d7203f630819d8e2e500",
+      "5e6cd5b72caef5867c84992a90069867422fc98c00",
+      "9f8c4d8b7c2a9fa6404533ec2a2c94891113cf7700",
+      "d114f2df69691cb2ef9741bce020cb60ed8ce38800",
+      "554043131f070f0315c8512af74e89ecc31ec4b200",
+      "247c751fc324f952208f5e7627b5b994881fdb4700",
+      "20b5b0b92b578dd98ac1bef682c24590a3dc814400",
+      "62ec48ad054e62c2ccdacdd585e1553822b0bd9800",
+      "bd5f5abe751c8486ec560648adbe0eea25d7f6e600",
+      "9a62b872f6a86a1431826991ba30d2d1df0836fe00",
+      "5724fd8842c744a2cecfd41c3b1f723fab0143c600",
+      "e5af31df9636ce816f6398d7801b665f9e2afdff00",
+      "e440aaa85ee5c45211ea847f5e2b225480effdad00",
+      "c7356d4b5023558d6f1137c7ad7c0e972e3f30cc00",
+      "1b90c5500a855816ac08b417a373a3fcf061863400",
+      "ca821a5852678932629a50a96a3d239911807b9a00",
+      "bbafd8b7c5992b97b3731f0acc0c3416c4ecfbd400",
+      "7df3f6f7bbf2cd5869bc71617b9a0ec702efb98500",
+      "d5d87b95b84fbb37418ff63fb3c8a96ed244819b00",
+      "c9649296f950519c6348b05c9863c2fbf543f13200",
+      "feac4908467b770fd39c1474ec8a3cdf5fdd013400",
+      "958e9c707a885041160ea0631c22f07090a370ed00",
+      "6528a1c191d26d83a5211ae501b76153c680736d00",
+      "a1d8602d21c46453ce23b084bdcafa1aeadcb27203",
+      "a8114aa4ecf5ad5953553d551889c3e13056b7d90c",
+      "528a9a5882c3e445af3817d105fc4743a69ad78800"
+    ],
+    "compact_witness": [
+      "55b79e1d5e1906d3c9bb65e699de26cf93e9eb29",
+      "8022c40c43f774ec7ba247024f19a3c08b7f44a6",
+      "c5821ada270036369d1931620ab0edf3695996dc",
+      "69b7e6b8fb11b06641207c34765b267260434f2b",
+      "538504e8ce9e04a2da92b2a89257f7a1733729dc",
+      "f99e3bf2037de431e0727d185a9d3028f0ab7912",
+      "a0b79eb4e1d08bee8b47b7e0d6ed9984c569b900",
+      "760e61b512612cb30868a450333945a2dda96fdb",
+      "d1698048a0565f077ea8e66f57af1e914829b367",
+      "23a0032b31c3933ca025ee28fb334dbd0389d893",
+      "ccbed33108248f2c3396590c0b34e7631a1b9ba0",
+      "aa844a01a59851add3c9bb1e170b7c87d1020079",
+      "4efac54e18814eba946e717ef67e9da71b16925e",
+      "c773b991663073fdc7633873f66e6cef6f600011",
+      "b455ca3ba53e831d2da6837940c4ee0244bef07c",
+      "57e2e9e1c5e9d4703e0441caa9acff2ceea22912",
+      "5b0b983b2be06693ff6dada3ce0fdedba20f9567",
+      "d5d9383feb4d96b4a4ba4bfa5fa2c2ac55a85086",
+      "0beea615637ffe6845b90d12ac7400397b1aac73",
+      "2f7e8b318763e85966412a3b6496c8807dfaf2ce",
+      "ebf849958c6a7a7d765aab6cc7629f802c6fc01f",
+      "d409dbbe766ba99971cdcf9591ed21338ff2acdc",
+      "a775fdb514c444befbb86983b1ca340341133653",
+      "77e27d486df428a2480b3ca00b6c049c6e40f297",
+      "e4b24b3fd6d991c9a1ad9aab4685b0f93e04270d",
+      "452399b2a678ebcb8a2dc63518e65053c36c5653",
+      "3a9deba089af6d0e276d1eb1c902b6a2451001f1",
+      "b8aa5a58a5f27d22bf42cc458b5b8ace326e86c7",
+      "c82fdbb80d848dd690ba82a32ee932528d425283",
+      "5bcce007e7097eb5e0fbc6220f47389e17ca6e7a",
+      "47e5fcbcea9ec63c64e89900b584f5da7aa86a17",
+      "008452186d33273ad4912338f479c603770eb13d",
+      "d2c27dd4cef9279e6852a7a1ef17f305fb6b213a",
+      "598f1fba4ff42077bd9979d0d277fa18dd717c50",
+      "4c7d73446b2588e094946f709d32ab4ad5648f25",
+      "4fd35e64c6b970cf7093df64044d30036474a7d9",
+      "4fe2df9a3b65958ad26d0fdb40f037283c9903fa",
+      "47fca3edc3693272c3215478211519902483858f",
+      "256999cf78a6e1b73147f6e50c9d7755e881c8f2",
+      "874266cd8c0a2406eb6c8ce6571f0711c544b7ff",
+      "0cc804f909e116e3f3d23b69184b9be43531503a",
+      "8993e4826ad2f8c16c60c0d7203f630819d8e2e5",
+      "5e6cd5b72caef5867c84992a90069867422fc98c",
+      "9f8c4d8b7c2a9fa6404533ec2a2c94891113cf77",
+      "d114f2df69691cb2ef9741bce020cb60ed8ce388",
+      "554043131f070f0315c8512af74e89ecc31ec4b2",
+      "247c751fc324f952208f5e7627b5b994881fdb47",
+      "20b5b0b92b578dd98ac1bef682c24590a3dc8144",
+      "62ec48ad054e62c2ccdacdd585e1553822b0bd98",
+      "bd5f5abe751c8486ec560648adbe0eea25d7f6e6",
+      "9a62b872f6a86a1431826991ba30d2d1df0836fe",
+      "5724fd8842c744a2cecfd41c3b1f723fab0143c6",
+      "e5af31df9636ce816f6398d7801b665f9e2afdff",
+      "e440aaa85ee5c45211ea847f5e2b225480effdad",
+      "c7356d4b5023558d6f1137c7ad7c0e972e3f30cc",
+      "1b90c5500a855816ac08b417a373a3fcf0618634",
+      "ca821a5852678932629a50a96a3d239911807b9a",
+      "bbafd8b7c5992b97b3731f0acc0c3416c4ecfbd4",
+      "7df3f6f7bbf2cd5869bc71617b9a0ec702efb985",
+      "d5d87b95b84fbb37418ff63fb3c8a96ed244819b",
+      "c9649296f950519c6348b05c9863c2fbf543f132",
+      "feac4908467b770fd39c1474ec8a3cdf5fdd0134",
+      "958e9c707a885041160ea0631c22f07090a370ed",
+      "6528a1c191d26d83a5211ae501b76153c680736d",
+      "a1d8602d21c46453ce23b084bdcafa1aeadcb272",
+      "a8114aa4ecf5ad5953553d551889c3e13056b7d9",
+      "528a9a5882c3e445af3817d105fc4743a69ad788"
+    ],
+    "compact_signature": [
+      "55b79e1d5e1906d3c9bb65e699de26cf93e9eb29",
+      "8022c40c43f774ec7ba247024f19a3c08b7f44a6",
+      "c5821ada270036369d1931620ab0edf3695996dc",
+      "69b7e6b8fb11b06641207c34765b267260434f2b",
+      "538504e8ce9e04a2da92b2a89257f7a1733729dc",
+      "f99e3bf2037de431e0727d185a9d3028f0ab7912",
+      "a0b79eb4e1d08bee8b47b7e0d6ed9984c569b900",
+      "760e61b512612cb30868a450333945a2dda96fdb",
+      "d1698048a0565f077ea8e66f57af1e914829b367",
+      "23a0032b31c3933ca025ee28fb334dbd0389d893",
+      "ccbed33108248f2c3396590c0b34e7631a1b9ba0",
+      "aa844a01a59851add3c9bb1e170b7c87d1020079",
+      "4efac54e18814eba946e717ef67e9da71b16925e",
+      "c773b991663073fdc7633873f66e6cef6f600011",
+      "b455ca3ba53e831d2da6837940c4ee0244bef07c",
+      "57e2e9e1c5e9d4703e0441caa9acff2ceea22912",
+      "5b0b983b2be06693ff6dada3ce0fdedba20f9567",
+      "d5d9383feb4d96b4a4ba4bfa5fa2c2ac55a85086",
+      "0beea615637ffe6845b90d12ac7400397b1aac73",
+      "2f7e8b318763e85966412a3b6496c8807dfaf2ce",
+      "ebf849958c6a7a7d765aab6cc7629f802c6fc01f",
+      "d409dbbe766ba99971cdcf9591ed21338ff2acdc",
+      "a775fdb514c444befbb86983b1ca340341133653",
+      "77e27d486df428a2480b3ca00b6c049c6e40f297",
+      "e4b24b3fd6d991c9a1ad9aab4685b0f93e04270d",
+      "452399b2a678ebcb8a2dc63518e65053c36c5653",
+      "3a9deba089af6d0e276d1eb1c902b6a2451001f1",
+      "b8aa5a58a5f27d22bf42cc458b5b8ace326e86c7",
+      "c82fdbb80d848dd690ba82a32ee932528d425283",
+      "5bcce007e7097eb5e0fbc6220f47389e17ca6e7a",
+      "47e5fcbcea9ec63c64e89900b584f5da7aa86a17",
+      "008452186d33273ad4912338f479c603770eb13d",
+      "d2c27dd4cef9279e6852a7a1ef17f305fb6b213a",
+      "598f1fba4ff42077bd9979d0d277fa18dd717c50",
+      "4c7d73446b2588e094946f709d32ab4ad5648f25",
+      "4fd35e64c6b970cf7093df64044d30036474a7d9",
+      "4fe2df9a3b65958ad26d0fdb40f037283c9903fa",
+      "47fca3edc3693272c3215478211519902483858f",
+      "256999cf78a6e1b73147f6e50c9d7755e881c8f2",
+      "874266cd8c0a2406eb6c8ce6571f0711c544b7ff",
+      "0cc804f909e116e3f3d23b69184b9be43531503a",
+      "8993e4826ad2f8c16c60c0d7203f630819d8e2e5",
+      "5e6cd5b72caef5867c84992a90069867422fc98c",
+      "9f8c4d8b7c2a9fa6404533ec2a2c94891113cf77",
+      "d114f2df69691cb2ef9741bce020cb60ed8ce388",
+      "554043131f070f0315c8512af74e89ecc31ec4b2",
+      "247c751fc324f952208f5e7627b5b994881fdb47",
+      "20b5b0b92b578dd98ac1bef682c24590a3dc8144",
+      "62ec48ad054e62c2ccdacdd585e1553822b0bd98",
+      "bd5f5abe751c8486ec560648adbe0eea25d7f6e6",
+      "9a62b872f6a86a1431826991ba30d2d1df0836fe",
+      "5724fd8842c744a2cecfd41c3b1f723fab0143c6",
+      "e5af31df9636ce816f6398d7801b665f9e2afdff",
+      "e440aaa85ee5c45211ea847f5e2b225480effdad",
+      "c7356d4b5023558d6f1137c7ad7c0e972e3f30cc",
+      "1b90c5500a855816ac08b417a373a3fcf0618634",
+      "ca821a5852678932629a50a96a3d239911807b9a",
+      "bbafd8b7c5992b97b3731f0acc0c3416c4ecfbd4",
+      "7df3f6f7bbf2cd5869bc71617b9a0ec702efb985",
+      "d5d87b95b84fbb37418ff63fb3c8a96ed244819b",
+      "c9649296f950519c6348b05c9863c2fbf543f132",
+      "feac4908467b770fd39c1474ec8a3cdf5fdd0134",
+      "958e9c707a885041160ea0631c22f07090a370ed",
+      "6528a1c191d26d83a5211ae501b76153c680736d",
+      "a1d8602d21c46453ce23b084bdcafa1aeadcb272",
+      "a8114aa4ecf5ad5953553d551889c3e13056b7d9",
+      "528a9a5882c3e445af3817d105fc4743a69ad788"
+    ]
+  },
+  {
+    "message": "0000000000000000000000000000000000000000000000000000000000000000",
+    "secretKey": "4d29f70050e770d5e22d9c7c13ed358b707c821e",
+    "publicKey": [
+      "c4f2743478ba2ec82a466cf1499f277b1758dc26",
+      "d601c09e268158a88dd69a1286fce96a806287bd",
+      "a6b35dd52d33ef064c8c311c58c483752d71433a",
+      "49b2569f3b0755db345e3d886aaf88b2c2775e19",
+      "1a994dfef180eeabdd42b79abbab7197c7152d13",
+      "d65f26104d0d38e2fe09155ecce78a5e508ba65a",
+      "128d7be5952ddb6cdbaf5ced87f150b59549b97c",
+      "ede7fc6c6b3565d417a221332ff84dbe17d28275",
+      "f26f8f6b24cf8c9a23114613f11cfefd4ccc011f",
+      "41176f1d22f841807da36f837df36f9c63fdbd38",
+      "2025546ae412e0ab37e237ca7eb8e1c20a54579b",
+      "05698f0ee29b3d5eb62b1cc4da201c0638611b09",
+      "3b12ad267a727413666ab6dff78430ada15da2d5",
+      "a3087b5c93069851ffb66cddeca3b7523b19c369",
+      "38a4785aca40fceded2a16b896a1bca5c588afe1",
+      "26216c5f3685b23a9b16398144848991919fb425",
+      "021c3804056c0856800bc2e5c9be90e79767c065",
+      "aa4eaba86e552e9e4bbce8f9b6654d90818fe188",
+      "590cee77da6587000384752dc19eadc6089a8a95",
+      "9777d0c84a5bfd6dbbec645e4a5d45f289e6284c",
+      "172007bb2dce0832477d3a0cbaee458ea97d5655",
+      "006c43d90e7a9655670034558fdad535ef4486c1",
+      "150d6dda77220bcef04b53d504f924cd9861c7d5",
+      "2587876e1b1a561c03d56f1615434507bc613d64",
+      "74cb3affb892f37b9017822cee08a2ca5184ca37",
+      "91f612fbcf6a618bda3331b09a71a06c231a8542",
+      "a66761120e3ade813a6c585db343a763d2088d8b",
+      "b5f12eff90e907d56638ddfeac85972f048feff7",
+      "4a30732c1ca5df25bf93bac6a47bc29646ccb330",
+      "b1d37254e7960b04d7e3f9c8b03f3d7405e2c6e4",
+      "7d28e48b14449d61371045653bdfdedf70fc903e",
+      "c1f3932822eb6c839c7651afefebcef8b0825059",
+      "3fec9bc3e6c7d8a16c42e6abeff0cfcc95a0fdf1",
+      "e9a67d8834a3ef9eeb44c8bec142d1966f85941e",
+      "279044460682d432e5bfada1cfc8731d4b24ba9f",
+      "e35f66fa8b3cadebeec6454af51e8248f283e61b",
+      "d5e88ca6ad34963a0da5d2c87e717549c006250b",
+      "4818f4adc458f328b7641e682c1f423c9e66e939",
+      "2fb667e3d273a6bdb516723e5b5e0df5ef23375e",
+      "b36cbe5d9421ad1c9606300ae4497670dda05a20",
+      "0531cfce5a96339308e77ced738344a2a2372530",
+      "af4e758cfc60c8db364eb6877fbe44cbffdcf948",
+      "9815beda690161cdb6fe390e706660418fdfbe07",
+      "ea52ac15be89121e92526572cf3df63969a49b1c",
+      "c4767449ef22626e9af01d2eda70e456cbe63a86",
+      "f93c15808bdca3c90aafc090d15c588803911354",
+      "eadf0c9140b005bb0d568a8d3dae382766777ec1",
+      "3fc7f11e5cb4e908db682d18f0e79c42fd325881",
+      "33db02c160d291490ca6ec2979f4f49ca06dd187",
+      "2c375ef623fb57c8234892d6b6266ec4fc10dac8",
+      "15f4cd912ffcf6657ef271fd6d854be009d8e712",
+      "57c98e8516456eb8779f116f129b21cbf285e040",
+      "4b8d776617bd355eb30e7d606a0055cdb6759ad4",
+      "c387aa0924cfa6f04f031283b6ab576f022b66ad",
+      "3253d75c0a481ea7be6a800ee6ea397c5208e661",
+      "ef01d4e30bd72a6c14ea7b18abfecfcb70f4c278",
+      "78975370f776cbdbbd41285ac6f5861ee16b2fb9",
+      "04916abe3ab7ebf013b7a3d8447d6af679d275ce",
+      "e0e5ff5313fe2ba674c107049a2c4ca3137f69a5",
+      "bc13b1747b11b74500966103eaad44da7c2f8256",
+      "bf06ad0e1e7477760f8196500c2d09b3b8a4cb44",
+      "157394ea6c13cf2c87ae2537747fddec677a95b4",
+      "7ac882a5f313991a03bdf1d2b9dcbdd49800fc08",
+      "c564d53835f4afbba18f33f7f0b63763f3b18174",
+      "591c61126771d8fdbc1e5be0e2c2438f24234f0f",
+      "e6be06730fb6ca999d2ed12828ab599bfb78043e",
+      "bf9001677e83db5a9b01a68214d79296e9e76f53"
+    ],
+    "witness": [
+      "ea134e3426947905126241ae878249b68cd1793c",
+      "",
+      "2a4f30fd65e8df3e8105c69e0cde3d3e112da560",
+      "",
+      "277312c614717353bfd4a6f58e2c6e1e9980ceb4",
+      "",
+      "634a420b3c96987632f77965f366e420f546427f",
+      "",
+      "217df8fe27c00ec2f9ce7d4f3d8a618118b8a8ec",
+      "",
+      "b6625e117197a66b6a469217eddc0e71b7deacce",
+      "",
+      "0776c59ee74dbcea955e2435f0ac16ab9b6f29d7",
+      "",
+      "d5044bfd5f8e5610c02d19cbe102d73b4177a7a8",
+      "",
+      "8cf8a9a6fccd7305aec87d9d7d5ef077c1e5d440",
+      "",
+      "821b88981f7adec30ce8e7b46189d1c2a3858769",
+      "",
+      "9dc99da40f2e8911c29568ae6cd33dc2bf13be4b",
+      "",
+      "a4980f699001aa50888cee6dd286e6bbca780be7",
+      "",
+      "c70a6438c14a74b467d8780e8c44a2486939b891",
+      "",
+      "bf34df2f8a699282b30f6143371516426e7d5417",
+      "",
+      "9ed4ea62e8a65b6ccb2406f0e35bf8d636602c38",
+      "",
+      "10b4a3ee0f706ba20f20543af074e9f6bc94d571",
+      "",
+      "812058a6e612385a18da8718be7150088cca28c2",
+      "",
+      "9cc0fcf761f1ff26d2648367418a9f7740b49a1c",
+      "",
+      "361ba2511758a4a0b36c8569afec7c7f17ee41dc",
+      "",
+      "7a2968780b4b3cb294b0cc455aa007c36157d8c0",
+      "",
+      "c88eb8d3ce9291efd50315c09db9dfb2a376fe7e",
+      "",
+      "66e96c0984ec7ff51ebb74057628f20e31ba8f04",
+      "",
+      "3cd9e57b42653788de57feaa8b7e7b5a3ad74280",
+      "",
+      "3d0e0f3a9c526e11f8d5522dbed2d119f916fe71",
+      "",
+      "1a6d85741a22e3266208060f509231cd0411fe85",
+      "",
+      "fd7b1a109c798549d9a3fe3617769425ddf65c99",
+      "",
+      "c99a175d76dcdf83335545b8574195c87acae96c",
+      "",
+      "2423032a96546c957463a18a8390aa4642f8c02c",
+      "",
+      "69de1b08905c86c8e5f0a3b7be1d1c291a0522b9",
+      "",
+      "f5d73d8c120f61e100446e7a63bbeb3dc6ef1252",
+      "",
+      "d6e8a4864dfcaea4f871e75a92c85c0d7d2ff823",
+      "",
+      "6a9dda8f21633ea6d805d8292192e4a2dc1e937b",
+      "",
+      "c9f36a685844ccb13447d0d8c4c4fafde7b041b4",
+      "",
+      "1b76aa351a62925fa77b0cf40b19ad1bbd850cd8",
+      "",
+      "253d254594a84657b15ef462c21b8e95a41f3da0",
+      "",
+      "54575655d946628e3c02c5e9961020d684d77fb8",
+      "",
+      "a0ce58f1de4b468beeade0fbf3023da1f7ebfbca",
+      "",
+      "f35f175cb724e6ddc28dd8d33f0ddc6ce39f66b7",
+      "",
+      "9b72cacf8ded2905cb32e6749713cda229dcd5d1",
+      "",
+      "3f825a662960602e520566833152dfdbcb0df700",
+      "",
+      "139ae3892aee40e1054f7dab9a66c50a91ac6f96",
+      "",
+      "9078fb6390e9b0ca963c17cd178f3d8a4d5a5b9e",
+      "",
+      "27ccf4ff4ab835e1be707d2788a4e13c52d46520",
+      "",
+      "2e441dd81f15941ae0d6d4df8aa10ab8d4476ace",
+      "",
+      "a21d249c5a14d13e6247046af1e95c105e85493c",
+      "",
+      "37c988ad74562f7d6dda8f4c1042fc12bfc22cb5",
+      "",
+      "8b3a6d2385eee5b69420de91c9f50b5f84f00102",
+      "",
+      "dcdf5fa5aef1d5f11e5c0688674eaf9eeadb65d7",
+      "",
+      "e85dc003e4d71a38f1b0877bc9b3106030ad8ade",
+      "",
+      "e4c0052ba884bb95f7292b9eec523334d81539f3",
+      "",
+      "361dd6d85666c4999aaf017aa1a260d4505e28e2",
+      "",
+      "973a89b91d82abbac1bdc721ba845ef72d513832",
+      "",
+      "42bc71b1cd08ef1c29f0e597f080cc44185e8211",
+      "",
+      "9f35b4836fc1feb0f4cee55651a99211b238c9a7",
+      "",
+      "cd3b6fcb55ae85dff7b1c1e44e0363f2cc648eda",
+      "",
+      "3f8b403a4c7edcf10d2cbf96d8457bb54509567d",
+      "",
+      "c5dee9ffd046461540b8fcf7b298dd8810758787",
+      "",
+      "0723fc68cdfb634eef10872f7b2b2651dd5e8212",
+      "",
+      "761fe2f816458001bdf3400cc57377cccc39073a",
+      "",
+      "5506cc08ce76f6dc62564c571ccd07e710550e58",
+      "",
+      "c76edc6f9c5fbb543e5c56ba081e9c68e64c586e",
+      "",
+      "b13566f170b9127cd30c6aaf5657fde5be502852",
+      "",
+      "e0b64e67806dceef53352bd5885c55445bc24e8f",
+      "",
+      "770496f07dc802adb367a77e9e07f37cf64350bb",
+      "",
+      "8a858766ff3967e54b0b2d12f8dc4efa95f3e222",
+      "03",
+      "e0181db5f0ed850948de120191a0cd3590a7cb8a",
+      "0c",
+      "b4560a940d91b938610a75547653e9c536675176",
+      ""
+    ],
+    "signature": [
+      "ea134e3426947905126241ae878249b68cd1793c00",
+      "2a4f30fd65e8df3e8105c69e0cde3d3e112da56000",
+      "277312c614717353bfd4a6f58e2c6e1e9980ceb400",
+      "634a420b3c96987632f77965f366e420f546427f00",
+      "217df8fe27c00ec2f9ce7d4f3d8a618118b8a8ec00",
+      "b6625e117197a66b6a469217eddc0e71b7deacce00",
+      "0776c59ee74dbcea955e2435f0ac16ab9b6f29d700",
+      "d5044bfd5f8e5610c02d19cbe102d73b4177a7a800",
+      "8cf8a9a6fccd7305aec87d9d7d5ef077c1e5d44000",
+      "821b88981f7adec30ce8e7b46189d1c2a385876900",
+      "9dc99da40f2e8911c29568ae6cd33dc2bf13be4b00",
+      "a4980f699001aa50888cee6dd286e6bbca780be700",
+      "c70a6438c14a74b467d8780e8c44a2486939b89100",
+      "bf34df2f8a699282b30f6143371516426e7d541700",
+      "9ed4ea62e8a65b6ccb2406f0e35bf8d636602c3800",
+      "10b4a3ee0f706ba20f20543af074e9f6bc94d57100",
+      "812058a6e612385a18da8718be7150088cca28c200",
+      "9cc0fcf761f1ff26d2648367418a9f7740b49a1c00",
+      "361ba2511758a4a0b36c8569afec7c7f17ee41dc00",
+      "7a2968780b4b3cb294b0cc455aa007c36157d8c000",
+      "c88eb8d3ce9291efd50315c09db9dfb2a376fe7e00",
+      "66e96c0984ec7ff51ebb74057628f20e31ba8f0400",
+      "3cd9e57b42653788de57feaa8b7e7b5a3ad7428000",
+      "3d0e0f3a9c526e11f8d5522dbed2d119f916fe7100",
+      "1a6d85741a22e3266208060f509231cd0411fe8500",
+      "fd7b1a109c798549d9a3fe3617769425ddf65c9900",
+      "c99a175d76dcdf83335545b8574195c87acae96c00",
+      "2423032a96546c957463a18a8390aa4642f8c02c00",
+      "69de1b08905c86c8e5f0a3b7be1d1c291a0522b900",
+      "f5d73d8c120f61e100446e7a63bbeb3dc6ef125200",
+      "d6e8a4864dfcaea4f871e75a92c85c0d7d2ff82300",
+      "6a9dda8f21633ea6d805d8292192e4a2dc1e937b00",
+      "c9f36a685844ccb13447d0d8c4c4fafde7b041b400",
+      "1b76aa351a62925fa77b0cf40b19ad1bbd850cd800",
+      "253d254594a84657b15ef462c21b8e95a41f3da000",
+      "54575655d946628e3c02c5e9961020d684d77fb800",
+      "a0ce58f1de4b468beeade0fbf3023da1f7ebfbca00",
+      "f35f175cb724e6ddc28dd8d33f0ddc6ce39f66b700",
+      "9b72cacf8ded2905cb32e6749713cda229dcd5d100",
+      "3f825a662960602e520566833152dfdbcb0df70000",
+      "139ae3892aee40e1054f7dab9a66c50a91ac6f9600",
+      "9078fb6390e9b0ca963c17cd178f3d8a4d5a5b9e00",
+      "27ccf4ff4ab835e1be707d2788a4e13c52d4652000",
+      "2e441dd81f15941ae0d6d4df8aa10ab8d4476ace00",
+      "a21d249c5a14d13e6247046af1e95c105e85493c00",
+      "37c988ad74562f7d6dda8f4c1042fc12bfc22cb500",
+      "8b3a6d2385eee5b69420de91c9f50b5f84f0010200",
+      "dcdf5fa5aef1d5f11e5c0688674eaf9eeadb65d700",
+      "e85dc003e4d71a38f1b0877bc9b3106030ad8ade00",
+      "e4c0052ba884bb95f7292b9eec523334d81539f300",
+      "361dd6d85666c4999aaf017aa1a260d4505e28e200",
+      "973a89b91d82abbac1bdc721ba845ef72d51383200",
+      "42bc71b1cd08ef1c29f0e597f080cc44185e821100",
+      "9f35b4836fc1feb0f4cee55651a99211b238c9a700",
+      "cd3b6fcb55ae85dff7b1c1e44e0363f2cc648eda00",
+      "3f8b403a4c7edcf10d2cbf96d8457bb54509567d00",
+      "c5dee9ffd046461540b8fcf7b298dd881075878700",
+      "0723fc68cdfb634eef10872f7b2b2651dd5e821200",
+      "761fe2f816458001bdf3400cc57377cccc39073a00",
+      "5506cc08ce76f6dc62564c571ccd07e710550e5800",
+      "c76edc6f9c5fbb543e5c56ba081e9c68e64c586e00",
+      "b13566f170b9127cd30c6aaf5657fde5be50285200",
+      "e0b64e67806dceef53352bd5885c55445bc24e8f00",
+      "770496f07dc802adb367a77e9e07f37cf64350bb00",
+      "8a858766ff3967e54b0b2d12f8dc4efa95f3e22203",
+      "e0181db5f0ed850948de120191a0cd3590a7cb8a0c",
+      "b4560a940d91b938610a75547653e9c53667517600"
+    ],
+    "compact_witness": [
+      "ea134e3426947905126241ae878249b68cd1793c",
+      "2a4f30fd65e8df3e8105c69e0cde3d3e112da560",
+      "277312c614717353bfd4a6f58e2c6e1e9980ceb4",
+      "634a420b3c96987632f77965f366e420f546427f",
+      "217df8fe27c00ec2f9ce7d4f3d8a618118b8a8ec",
+      "b6625e117197a66b6a469217eddc0e71b7deacce",
+      "0776c59ee74dbcea955e2435f0ac16ab9b6f29d7",
+      "d5044bfd5f8e5610c02d19cbe102d73b4177a7a8",
+      "8cf8a9a6fccd7305aec87d9d7d5ef077c1e5d440",
+      "821b88981f7adec30ce8e7b46189d1c2a3858769",
+      "9dc99da40f2e8911c29568ae6cd33dc2bf13be4b",
+      "a4980f699001aa50888cee6dd286e6bbca780be7",
+      "c70a6438c14a74b467d8780e8c44a2486939b891",
+      "bf34df2f8a699282b30f6143371516426e7d5417",
+      "9ed4ea62e8a65b6ccb2406f0e35bf8d636602c38",
+      "10b4a3ee0f706ba20f20543af074e9f6bc94d571",
+      "812058a6e612385a18da8718be7150088cca28c2",
+      "9cc0fcf761f1ff26d2648367418a9f7740b49a1c",
+      "361ba2511758a4a0b36c8569afec7c7f17ee41dc",
+      "7a2968780b4b3cb294b0cc455aa007c36157d8c0",
+      "c88eb8d3ce9291efd50315c09db9dfb2a376fe7e",
+      "66e96c0984ec7ff51ebb74057628f20e31ba8f04",
+      "3cd9e57b42653788de57feaa8b7e7b5a3ad74280",
+      "3d0e0f3a9c526e11f8d5522dbed2d119f916fe71",
+      "1a6d85741a22e3266208060f509231cd0411fe85",
+      "fd7b1a109c798549d9a3fe3617769425ddf65c99",
+      "c99a175d76dcdf83335545b8574195c87acae96c",
+      "2423032a96546c957463a18a8390aa4642f8c02c",
+      "69de1b08905c86c8e5f0a3b7be1d1c291a0522b9",
+      "f5d73d8c120f61e100446e7a63bbeb3dc6ef1252",
+      "d6e8a4864dfcaea4f871e75a92c85c0d7d2ff823",
+      "6a9dda8f21633ea6d805d8292192e4a2dc1e937b",
+      "c9f36a685844ccb13447d0d8c4c4fafde7b041b4",
+      "1b76aa351a62925fa77b0cf40b19ad1bbd850cd8",
+      "253d254594a84657b15ef462c21b8e95a41f3da0",
+      "54575655d946628e3c02c5e9961020d684d77fb8",
+      "a0ce58f1de4b468beeade0fbf3023da1f7ebfbca",
+      "f35f175cb724e6ddc28dd8d33f0ddc6ce39f66b7",
+      "9b72cacf8ded2905cb32e6749713cda229dcd5d1",
+      "3f825a662960602e520566833152dfdbcb0df700",
+      "139ae3892aee40e1054f7dab9a66c50a91ac6f96",
+      "9078fb6390e9b0ca963c17cd178f3d8a4d5a5b9e",
+      "27ccf4ff4ab835e1be707d2788a4e13c52d46520",
+      "2e441dd81f15941ae0d6d4df8aa10ab8d4476ace",
+      "a21d249c5a14d13e6247046af1e95c105e85493c",
+      "37c988ad74562f7d6dda8f4c1042fc12bfc22cb5",
+      "8b3a6d2385eee5b69420de91c9f50b5f84f00102",
+      "dcdf5fa5aef1d5f11e5c0688674eaf9eeadb65d7",
+      "e85dc003e4d71a38f1b0877bc9b3106030ad8ade",
+      "e4c0052ba884bb95f7292b9eec523334d81539f3",
+      "361dd6d85666c4999aaf017aa1a260d4505e28e2",
+      "973a89b91d82abbac1bdc721ba845ef72d513832",
+      "42bc71b1cd08ef1c29f0e597f080cc44185e8211",
+      "9f35b4836fc1feb0f4cee55651a99211b238c9a7",
+      "cd3b6fcb55ae85dff7b1c1e44e0363f2cc648eda",
+      "3f8b403a4c7edcf10d2cbf96d8457bb54509567d",
+      "c5dee9ffd046461540b8fcf7b298dd8810758787",
+      "0723fc68cdfb634eef10872f7b2b2651dd5e8212",
+      "761fe2f816458001bdf3400cc57377cccc39073a",
+      "5506cc08ce76f6dc62564c571ccd07e710550e58",
+      "c76edc6f9c5fbb543e5c56ba081e9c68e64c586e",
+      "b13566f170b9127cd30c6aaf5657fde5be502852",
+      "e0b64e67806dceef53352bd5885c55445bc24e8f",
+      "770496f07dc802adb367a77e9e07f37cf64350bb",
+      "8a858766ff3967e54b0b2d12f8dc4efa95f3e222",
+      "e0181db5f0ed850948de120191a0cd3590a7cb8a",
+      "b4560a940d91b938610a75547653e9c536675176"
+    ],
+    "compact_signature": [
+      "ea134e3426947905126241ae878249b68cd1793c",
+      "2a4f30fd65e8df3e8105c69e0cde3d3e112da560",
+      "277312c614717353bfd4a6f58e2c6e1e9980ceb4",
+      "634a420b3c96987632f77965f366e420f546427f",
+      "217df8fe27c00ec2f9ce7d4f3d8a618118b8a8ec",
+      "b6625e117197a66b6a469217eddc0e71b7deacce",
+      "0776c59ee74dbcea955e2435f0ac16ab9b6f29d7",
+      "d5044bfd5f8e5610c02d19cbe102d73b4177a7a8",
+      "8cf8a9a6fccd7305aec87d9d7d5ef077c1e5d440",
+      "821b88981f7adec30ce8e7b46189d1c2a3858769",
+      "9dc99da40f2e8911c29568ae6cd33dc2bf13be4b",
+      "a4980f699001aa50888cee6dd286e6bbca780be7",
+      "c70a6438c14a74b467d8780e8c44a2486939b891",
+      "bf34df2f8a699282b30f6143371516426e7d5417",
+      "9ed4ea62e8a65b6ccb2406f0e35bf8d636602c38",
+      "10b4a3ee0f706ba20f20543af074e9f6bc94d571",
+      "812058a6e612385a18da8718be7150088cca28c2",
+      "9cc0fcf761f1ff26d2648367418a9f7740b49a1c",
+      "361ba2511758a4a0b36c8569afec7c7f17ee41dc",
+      "7a2968780b4b3cb294b0cc455aa007c36157d8c0",
+      "c88eb8d3ce9291efd50315c09db9dfb2a376fe7e",
+      "66e96c0984ec7ff51ebb74057628f20e31ba8f04",
+      "3cd9e57b42653788de57feaa8b7e7b5a3ad74280",
+      "3d0e0f3a9c526e11f8d5522dbed2d119f916fe71",
+      "1a6d85741a22e3266208060f509231cd0411fe85",
+      "fd7b1a109c798549d9a3fe3617769425ddf65c99",
+      "c99a175d76dcdf83335545b8574195c87acae96c",
+      "2423032a96546c957463a18a8390aa4642f8c02c",
+      "69de1b08905c86c8e5f0a3b7be1d1c291a0522b9",
+      "f5d73d8c120f61e100446e7a63bbeb3dc6ef1252",
+      "d6e8a4864dfcaea4f871e75a92c85c0d7d2ff823",
+      "6a9dda8f21633ea6d805d8292192e4a2dc1e937b",
+      "c9f36a685844ccb13447d0d8c4c4fafde7b041b4",
+      "1b76aa351a62925fa77b0cf40b19ad1bbd850cd8",
+      "253d254594a84657b15ef462c21b8e95a41f3da0",
+      "54575655d946628e3c02c5e9961020d684d77fb8",
+      "a0ce58f1de4b468beeade0fbf3023da1f7ebfbca",
+      "f35f175cb724e6ddc28dd8d33f0ddc6ce39f66b7",
+      "9b72cacf8ded2905cb32e6749713cda229dcd5d1",
+      "3f825a662960602e520566833152dfdbcb0df700",
+      "139ae3892aee40e1054f7dab9a66c50a91ac6f96",
+      "9078fb6390e9b0ca963c17cd178f3d8a4d5a5b9e",
+      "27ccf4ff4ab835e1be707d2788a4e13c52d46520",
+      "2e441dd81f15941ae0d6d4df8aa10ab8d4476ace",
+      "a21d249c5a14d13e6247046af1e95c105e85493c",
+      "37c988ad74562f7d6dda8f4c1042fc12bfc22cb5",
+      "8b3a6d2385eee5b69420de91c9f50b5f84f00102",
+      "dcdf5fa5aef1d5f11e5c0688674eaf9eeadb65d7",
+      "e85dc003e4d71a38f1b0877bc9b3106030ad8ade",
+      "e4c0052ba884bb95f7292b9eec523334d81539f3",
+      "361dd6d85666c4999aaf017aa1a260d4505e28e2",
+      "973a89b91d82abbac1bdc721ba845ef72d513832",
+      "42bc71b1cd08ef1c29f0e597f080cc44185e8211",
+      "9f35b4836fc1feb0f4cee55651a99211b238c9a7",
+      "cd3b6fcb55ae85dff7b1c1e44e0363f2cc648eda",
+      "3f8b403a4c7edcf10d2cbf96d8457bb54509567d",
+      "c5dee9ffd046461540b8fcf7b298dd8810758787",
+      "0723fc68cdfb634eef10872f7b2b2651dd5e8212",
+      "761fe2f816458001bdf3400cc57377cccc39073a",
+      "5506cc08ce76f6dc62564c571ccd07e710550e58",
+      "c76edc6f9c5fbb543e5c56ba081e9c68e64c586e",
+      "b13566f170b9127cd30c6aaf5657fde5be502852",
+      "e0b64e67806dceef53352bd5885c55445bc24e8f",
+      "770496f07dc802adb367a77e9e07f37cf64350bb",
+      "8a858766ff3967e54b0b2d12f8dc4efa95f3e222",
+      "e0181db5f0ed850948de120191a0cd3590a7cb8a",
+      "b4560a940d91b938610a75547653e9c536675176"
+    ]
+  },
+  {
+    "message": "0000000000000000000000000000000000000000000000000000000000000000",
+    "secretKey": "e7ae8985357c088d8e15771fe93f6433e90ce889",
+    "publicKey": [
+      "991b14ab8e587b2651838721a87b7ae0951f9687",
+      "6745e727b2ac9d09a89e7619017c27406e921a42",
+      "74029095f15377f6216e6ea0869f8cb82b3e9c43",
+      "2dfe2a649aae10dd5308d878ade56d4aa716190f",
+      "b3422890ab1b32b9e02a1896b155b83fd2e36e97",
+      "2697c95c0f8494d0e3bf3afa2d3dd53a1b3eb5cd",
+      "2f47fb0528825a811e04a4f9d9af5449707dfdf1",
+      "f4c2fb49322f6a275fb727616875c0b96a04dab4",
+      "98c0c50ca55ee40fbe03c98e040748d15548e5b1",
+      "04d5e4d902d0c3711b745810db823a6a912700ee",
+      "a8da1d4f5bd9004282bdd653f09307a33d28127e",
+      "bd27fa1d0cb5fa6a7075bab2655a9da5ce7dda26",
+      "24ddc81262f2a29c86911fafd9a5ba59f184e6f8",
+      "d4a3f8cc9cc64e2f8f043e30f9a794ab9f0d8c3a",
+      "17b24f2c11b7b98083d876fe3028f7ab64edb7b8",
+      "721012950249bdca98a671c38d58be0670553917",
+      "5295eb36244b8ad694e2c3d354f0f4f8fe14e362",
+      "d5e4427e131c41d133b8be6c084f12b067146a46",
+      "bf1b6bddc350e44d654f7dff31b0dc888be62322",
+      "bb2e21562016e1763f13e004c33047d8cfb8aa29",
+      "70b24db56b46c342381f003b29f2901c61d9cf2e",
+      "1e0a25cff3b143398c85918a547691c91b4620e6",
+      "544408fc74534ecb7bb02bfa6a1d081b6762b5c9",
+      "1cbe307f1358fab183f67fd835f04bfaf5247b54",
+      "2146b9367378148489934d4d27546cc788acbaf0",
+      "5eddfc51701a808943bd09b81bf90a0da138e2fd",
+      "7a40654771e5e0d81cea2957c038cdd5f3df27e6",
+      "bdb1b8c40ebe136a25af9236aabb554e8c861d3f",
+      "ef607787ac993027c13139a3bbb8ec11bae58f28",
+      "2347f3a9c672baefa1f7010ef484526131f0df60",
+      "ba8b440586901dc2f6e1409772d2a1b5651739b1",
+      "37610c05d9ff8292b5f398f4b6ca8a1d5917fb70",
+      "6afc6548a961bc4865b9bd0faaeaed5667b3c5d9",
+      "c2a03cefc4f49816a2fd5c44b512825e5f954360",
+      "7e605cb5247b6366eab7511c403789c5a1dd8207",
+      "4a4a43459e918bceeb8584f16c41f7a1ae066074",
+      "9c32d0ef9c7cb7ed776b6a5c7f6f9aecc29a917a",
+      "671f5c4a85f492e0d29c8c4383ab1468b41903e0",
+      "c991415c6dc4a1a812c33304b68bb9eda05ce29b",
+      "41b97d38bf89ad429d2b1bb17183cb0e204537f4",
+      "571b58989502f4d5c58eaadaa3b7fd7c3c47a6a5",
+      "8db5fd7e09df33976b400c6ca08cdaa7f79e2e4a",
+      "01b86c5631558e1e976e57f398fde48cfd5afb62",
+      "512dfb941e70c5bd958f2ab6ef6ddbb5f3a4a4bb",
+      "0eb6cb651bfb2d429e59bfaab7c9982b3956ea79",
+      "b3268ae726dba20235514f7aaefe5ff84fffd899",
+      "647f9b34cd82b93ad1c7e4f59df144af1bb7e26e",
+      "3ac0bd0f73772f36a00d10ecc88aeb64d2947753",
+      "789c678f5d5c8f11862b3d8c4ce9d605e0f1f448",
+      "cb8c23b4c802d394a9a8f5020b923dbc979ccbb2",
+      "a04234247d63918274487d8e71582e126930b311",
+      "fd1fa7bb82df75a8eb696ddef8cf691b1b15bcf5",
+      "63e2f6967066e43f76b5a5938e1cbcdb97b00382",
+      "51c57860a3de3248b82dfab35dbbc1cb6db4bd46",
+      "ac6e690f622613fcfc1f35aeea5b37c631ee85a2",
+      "f5719c550c6549a2fb097508792974e0facfbca4",
+      "e68e51fdaade44777d80a43456f9bf0fc1dfcfb1",
+      "fb8b26c2951a9c77eb492fc66833557760626f46",
+      "d438ae1a0f8e38280c3be361de5925fb07e526a5",
+      "2052c7d5cafcb6dba9e46a6b9527cd2ca6818abd",
+      "09b34553a5522da47236d976a0a6d4f533893d29",
+      "e71facb49878300694dff6f858c9c7066f79d923",
+      "d72c7cd58772a48137475e16b9ba66d134a497b9",
+      "ccdebfb1d9ca6fd8e20087c95b62606c062acf0c",
+      "ad27d092a767278b62dcda9eeb9f5094adf4ce6d",
+      "8ab049221c1bad6158d6b4b5bc729fd0862305ac",
+      "c234198854827989f703cca2fced4e9bd5d843eb"
+    ],
+    "witness": [
+      "2036eadf4d076e58a7b429010315d55a9e789406",
+      "",
+      "51f7b842c4b8e45ed68dccad5b6910a1e7ae0a15",
+      "",
+      "34c4dafcf688584859dcb3629b166e9f4c3cfd17",
+      "",
+      "af12afb1d9083da8f98f7a44eb933fa017bf208e",
+      "",
+      "994758c0e57e53d52b409211f7a236cf78969308",
+      "",
+      "4c353591a33fe943ffc562c299136ec3128aed35",
+      "",
+      "65f100a817eff080c39eaf513bb97f24b642a470",
+      "",
+      "e20af23391557bf298269cf0196352a64aed6030",
+      "",
+      "f7a38ea603e73f8029edde53fd43672e6e5f0a18",
+      "",
+      "094fa2cc1bfdc595e04a67644b089c16a0ed166f",
+      "",
+      "0088ac13c7d05ba0d13b489a60488eabd050b203",
+      "",
+      "65385580ba15f98b3aab428c5bb4ff29e0e31cf9",
+      "",
+      "2b23feda7b075f285b2c077361f127ad5ca8d379",
+      "",
+      "6767720ad109e74a8865bc50853971313f9f1aa1",
+      "",
+      "bd5e1e31c1c873740942094814e32c903575eee1",
+      "",
+      "1689ffbbd1bedaf55d65c183e46b948584c59a4f",
+      "",
+      "934dfa18c4edf79d3d1bb9d019e132e3a2ccb4cb",
+      "",
+      "0ca6acd84db9083bb12d97d981d15d118bb6c358",
+      "",
+      "23c186c12ba13f20e1ae8b842744d2cee49335fa",
+      "",
+      "73eb2583ba3df23cabba361f21fbc8e88c61f0f1",
+      "",
+      "689b7d68d10cc4f34b8ab4bb69d9ac7433072dbd",
+      "",
+      "5d460db25f200d3dd79d287c35b9fad8302b99ad",
+      "",
+      "68776a67c1bba7c15448d0d03787cac1a6af5ba5",
+      "",
+      "c014bc93b784383bdbb762ce1c29a7684421abcd",
+      "",
+      "502075a1259ea09502b2a3b38d601105bf2c3a88",
+      "",
+      "eaa2ca08d2e98404f3f2e780188845c38871fefd",
+      "",
+      "d0ce75ba0ccf2ea866555f02fdb6ee0df3db73be",
+      "",
+      "43e57a3910da4a6ba8775803433614bc62eec593",
+      "",
+      "3b49083eea72992052b47049c25030317ee38350",
+      "",
+      "322e4c2a268942704faebccc35bff76750d5b717",
+      "",
+      "687baae8b02c275885740f9813b0314d01eccc29",
+      "",
+      "3da98a20de84e02b886913aa8a48696b6c6f6e4a",
+      "",
+      "754731313959dc425136f2c024e2ebf5c1a692f6",
+      "",
+      "6b61ebbee0be137baa887f5ddfacfc5ffce32935",
+      "",
+      "76a11d5bf98b9fad038630294c10e7727b153604",
+      "",
+      "dfd6516fedce0599641bb6a6cac38c018d1eadf1",
+      "",
+      "9e0bfcc2eef0b448f12ad9c2185263ad60a80d1a",
+      "",
+      "141295c25f7e7bc7aab2d07f4dc152fc1f0e572b",
+      "",
+      "7370a764acf7889b080abafe7bf4f559b032f2d6",
+      "",
+      "1cbcc28795249c2ef38d7e096910ac5c64b25342",
+      "",
+      "f396b94272feb7fe8caf31042fdeb0b3ee5e610e",
+      "",
+      "6f77a7532711ea76163ac953e8776bd646f35ad3",
+      "",
+      "efc680dfba84c2657fb9def8193dad4717e8f062",
+      "",
+      "5b165e5edea32c14ee830d543999b7792a100501",
+      "",
+      "768b5fb0e9efbd1180e5082d169cf264645dd4d4",
+      "",
+      "024b9e9f9a453de2b9481fbce5d9d403de7f4e71",
+      "",
+      "d9e63bf77be851d5a7389f74e3bb3dcb2c17b1fe",
+      "",
+      "872b45c4c78df134d79b97e17ab221b380ebae1f",
+      "",
+      "b16692af73059e4ac03e53a750ff480dde609c2a",
+      "",
+      "d4c1ffb716db71d4721369e8b79b06b81569b114",
+      "",
+      "b397ee3fdebe14d2a2c6135ae1e0f92d981ce484",
+      "",
+      "90c7d3f1d2294b59aa326e24c04944b3d92e40e7",
+      "",
+      "d5f0e84c83861fe3372054f18c684ed538991fee",
+      "",
+      "41cb32e21c791f8be6ead8d820b51782560a09c9",
+      "",
+      "507495471cc1ad0847a482370e4e6451907fec25",
+      "",
+      "cdf34c7dc3242fb44f95b9031eb69e0cdcfeee21",
+      "",
+      "04825a69bc54e81c882c9deb63c547bf76c48006",
+      "",
+      "d901cbcad79bfeb3fa13dd72e05ab1fc893e656e",
+      "",
+      "567fa007448bb0f6ec406ad090799cc818960f43",
+      "",
+      "f87ee93c2b8ac3a95e97284d78b087958941f1b5",
+      "",
+      "9760189cb3da3e0b5a29084d00cf17525b920713",
+      "",
+      "52bd35218fcd50632cc33c3860e6608a807afb6c",
+      "",
+      "a21ba7e56670cba6dc8b2955668f9673772e53b5",
+      "",
+      "34c0f2d3f3b419d9c34ae37aec68ecf76b6b5b20",
+      "",
+      "d34c07381b37eae124ff70fccf4789dc6b9507a5",
+      "03",
+      "068516929ae866d45a19b77dba1d99bb8b7cd672",
+      "0c",
+      "1293ced8ca467a681b937ba6b9e9f6d8fa7e565d",
+      ""
+    ],
+    "signature": [
+      "2036eadf4d076e58a7b429010315d55a9e78940600",
+      "51f7b842c4b8e45ed68dccad5b6910a1e7ae0a1500",
+      "34c4dafcf688584859dcb3629b166e9f4c3cfd1700",
+      "af12afb1d9083da8f98f7a44eb933fa017bf208e00",
+      "994758c0e57e53d52b409211f7a236cf7896930800",
+      "4c353591a33fe943ffc562c299136ec3128aed3500",
+      "65f100a817eff080c39eaf513bb97f24b642a47000",
+      "e20af23391557bf298269cf0196352a64aed603000",
+      "f7a38ea603e73f8029edde53fd43672e6e5f0a1800",
+      "094fa2cc1bfdc595e04a67644b089c16a0ed166f00",
+      "0088ac13c7d05ba0d13b489a60488eabd050b20300",
+      "65385580ba15f98b3aab428c5bb4ff29e0e31cf900",
+      "2b23feda7b075f285b2c077361f127ad5ca8d37900",
+      "6767720ad109e74a8865bc50853971313f9f1aa100",
+      "bd5e1e31c1c873740942094814e32c903575eee100",
+      "1689ffbbd1bedaf55d65c183e46b948584c59a4f00",
+      "934dfa18c4edf79d3d1bb9d019e132e3a2ccb4cb00",
+      "0ca6acd84db9083bb12d97d981d15d118bb6c35800",
+      "23c186c12ba13f20e1ae8b842744d2cee49335fa00",
+      "73eb2583ba3df23cabba361f21fbc8e88c61f0f100",
+      "689b7d68d10cc4f34b8ab4bb69d9ac7433072dbd00",
+      "5d460db25f200d3dd79d287c35b9fad8302b99ad00",
+      "68776a67c1bba7c15448d0d03787cac1a6af5ba500",
+      "c014bc93b784383bdbb762ce1c29a7684421abcd00",
+      "502075a1259ea09502b2a3b38d601105bf2c3a8800",
+      "eaa2ca08d2e98404f3f2e780188845c38871fefd00",
+      "d0ce75ba0ccf2ea866555f02fdb6ee0df3db73be00",
+      "43e57a3910da4a6ba8775803433614bc62eec59300",
+      "3b49083eea72992052b47049c25030317ee3835000",
+      "322e4c2a268942704faebccc35bff76750d5b71700",
+      "687baae8b02c275885740f9813b0314d01eccc2900",
+      "3da98a20de84e02b886913aa8a48696b6c6f6e4a00",
+      "754731313959dc425136f2c024e2ebf5c1a692f600",
+      "6b61ebbee0be137baa887f5ddfacfc5ffce3293500",
+      "76a11d5bf98b9fad038630294c10e7727b15360400",
+      "dfd6516fedce0599641bb6a6cac38c018d1eadf100",
+      "9e0bfcc2eef0b448f12ad9c2185263ad60a80d1a00",
+      "141295c25f7e7bc7aab2d07f4dc152fc1f0e572b00",
+      "7370a764acf7889b080abafe7bf4f559b032f2d600",
+      "1cbcc28795249c2ef38d7e096910ac5c64b2534200",
+      "f396b94272feb7fe8caf31042fdeb0b3ee5e610e00",
+      "6f77a7532711ea76163ac953e8776bd646f35ad300",
+      "efc680dfba84c2657fb9def8193dad4717e8f06200",
+      "5b165e5edea32c14ee830d543999b7792a10050100",
+      "768b5fb0e9efbd1180e5082d169cf264645dd4d400",
+      "024b9e9f9a453de2b9481fbce5d9d403de7f4e7100",
+      "d9e63bf77be851d5a7389f74e3bb3dcb2c17b1fe00",
+      "872b45c4c78df134d79b97e17ab221b380ebae1f00",
+      "b16692af73059e4ac03e53a750ff480dde609c2a00",
+      "d4c1ffb716db71d4721369e8b79b06b81569b11400",
+      "b397ee3fdebe14d2a2c6135ae1e0f92d981ce48400",
+      "90c7d3f1d2294b59aa326e24c04944b3d92e40e700",
+      "d5f0e84c83861fe3372054f18c684ed538991fee00",
+      "41cb32e21c791f8be6ead8d820b51782560a09c900",
+      "507495471cc1ad0847a482370e4e6451907fec2500",
+      "cdf34c7dc3242fb44f95b9031eb69e0cdcfeee2100",
+      "04825a69bc54e81c882c9deb63c547bf76c4800600",
+      "d901cbcad79bfeb3fa13dd72e05ab1fc893e656e00",
+      "567fa007448bb0f6ec406ad090799cc818960f4300",
+      "f87ee93c2b8ac3a95e97284d78b087958941f1b500",
+      "9760189cb3da3e0b5a29084d00cf17525b92071300",
+      "52bd35218fcd50632cc33c3860e6608a807afb6c00",
+      "a21ba7e56670cba6dc8b2955668f9673772e53b500",
+      "34c0f2d3f3b419d9c34ae37aec68ecf76b6b5b2000",
+      "d34c07381b37eae124ff70fccf4789dc6b9507a503",
+      "068516929ae866d45a19b77dba1d99bb8b7cd6720c",
+      "1293ced8ca467a681b937ba6b9e9f6d8fa7e565d00"
+    ],
+    "compact_witness": [
+      "2036eadf4d076e58a7b429010315d55a9e789406",
+      "51f7b842c4b8e45ed68dccad5b6910a1e7ae0a15",
+      "34c4dafcf688584859dcb3629b166e9f4c3cfd17",
+      "af12afb1d9083da8f98f7a44eb933fa017bf208e",
+      "994758c0e57e53d52b409211f7a236cf78969308",
+      "4c353591a33fe943ffc562c299136ec3128aed35",
+      "65f100a817eff080c39eaf513bb97f24b642a470",
+      "e20af23391557bf298269cf0196352a64aed6030",
+      "f7a38ea603e73f8029edde53fd43672e6e5f0a18",
+      "094fa2cc1bfdc595e04a67644b089c16a0ed166f",
+      "0088ac13c7d05ba0d13b489a60488eabd050b203",
+      "65385580ba15f98b3aab428c5bb4ff29e0e31cf9",
+      "2b23feda7b075f285b2c077361f127ad5ca8d379",
+      "6767720ad109e74a8865bc50853971313f9f1aa1",
+      "bd5e1e31c1c873740942094814e32c903575eee1",
+      "1689ffbbd1bedaf55d65c183e46b948584c59a4f",
+      "934dfa18c4edf79d3d1bb9d019e132e3a2ccb4cb",
+      "0ca6acd84db9083bb12d97d981d15d118bb6c358",
+      "23c186c12ba13f20e1ae8b842744d2cee49335fa",
+      "73eb2583ba3df23cabba361f21fbc8e88c61f0f1",
+      "689b7d68d10cc4f34b8ab4bb69d9ac7433072dbd",
+      "5d460db25f200d3dd79d287c35b9fad8302b99ad",
+      "68776a67c1bba7c15448d0d03787cac1a6af5ba5",
+      "c014bc93b784383bdbb762ce1c29a7684421abcd",
+      "502075a1259ea09502b2a3b38d601105bf2c3a88",
+      "eaa2ca08d2e98404f3f2e780188845c38871fefd",
+      "d0ce75ba0ccf2ea866555f02fdb6ee0df3db73be",
+      "43e57a3910da4a6ba8775803433614bc62eec593",
+      "3b49083eea72992052b47049c25030317ee38350",
+      "322e4c2a268942704faebccc35bff76750d5b717",
+      "687baae8b02c275885740f9813b0314d01eccc29",
+      "3da98a20de84e02b886913aa8a48696b6c6f6e4a",
+      "754731313959dc425136f2c024e2ebf5c1a692f6",
+      "6b61ebbee0be137baa887f5ddfacfc5ffce32935",
+      "76a11d5bf98b9fad038630294c10e7727b153604",
+      "dfd6516fedce0599641bb6a6cac38c018d1eadf1",
+      "9e0bfcc2eef0b448f12ad9c2185263ad60a80d1a",
+      "141295c25f7e7bc7aab2d07f4dc152fc1f0e572b",
+      "7370a764acf7889b080abafe7bf4f559b032f2d6",
+      "1cbcc28795249c2ef38d7e096910ac5c64b25342",
+      "f396b94272feb7fe8caf31042fdeb0b3ee5e610e",
+      "6f77a7532711ea76163ac953e8776bd646f35ad3",
+      "efc680dfba84c2657fb9def8193dad4717e8f062",
+      "5b165e5edea32c14ee830d543999b7792a100501",
+      "768b5fb0e9efbd1180e5082d169cf264645dd4d4",
+      "024b9e9f9a453de2b9481fbce5d9d403de7f4e71",
+      "d9e63bf77be851d5a7389f74e3bb3dcb2c17b1fe",
+      "872b45c4c78df134d79b97e17ab221b380ebae1f",
+      "b16692af73059e4ac03e53a750ff480dde609c2a",
+      "d4c1ffb716db71d4721369e8b79b06b81569b114",
+      "b397ee3fdebe14d2a2c6135ae1e0f92d981ce484",
+      "90c7d3f1d2294b59aa326e24c04944b3d92e40e7",
+      "d5f0e84c83861fe3372054f18c684ed538991fee",
+      "41cb32e21c791f8be6ead8d820b51782560a09c9",
+      "507495471cc1ad0847a482370e4e6451907fec25",
+      "cdf34c7dc3242fb44f95b9031eb69e0cdcfeee21",
+      "04825a69bc54e81c882c9deb63c547bf76c48006",
+      "d901cbcad79bfeb3fa13dd72e05ab1fc893e656e",
+      "567fa007448bb0f6ec406ad090799cc818960f43",
+      "f87ee93c2b8ac3a95e97284d78b087958941f1b5",
+      "9760189cb3da3e0b5a29084d00cf17525b920713",
+      "52bd35218fcd50632cc33c3860e6608a807afb6c",
+      "a21ba7e56670cba6dc8b2955668f9673772e53b5",
+      "34c0f2d3f3b419d9c34ae37aec68ecf76b6b5b20",
+      "d34c07381b37eae124ff70fccf4789dc6b9507a5",
+      "068516929ae866d45a19b77dba1d99bb8b7cd672",
+      "1293ced8ca467a681b937ba6b9e9f6d8fa7e565d"
+    ],
+    "compact_signature": [
+      "2036eadf4d076e58a7b429010315d55a9e789406",
+      "51f7b842c4b8e45ed68dccad5b6910a1e7ae0a15",
+      "34c4dafcf688584859dcb3629b166e9f4c3cfd17",
+      "af12afb1d9083da8f98f7a44eb933fa017bf208e",
+      "994758c0e57e53d52b409211f7a236cf78969308",
+      "4c353591a33fe943ffc562c299136ec3128aed35",
+      "65f100a817eff080c39eaf513bb97f24b642a470",
+      "e20af23391557bf298269cf0196352a64aed6030",
+      "f7a38ea603e73f8029edde53fd43672e6e5f0a18",
+      "094fa2cc1bfdc595e04a67644b089c16a0ed166f",
+      "0088ac13c7d05ba0d13b489a60488eabd050b203",
+      "65385580ba15f98b3aab428c5bb4ff29e0e31cf9",
+      "2b23feda7b075f285b2c077361f127ad5ca8d379",
+      "6767720ad109e74a8865bc50853971313f9f1aa1",
+      "bd5e1e31c1c873740942094814e32c903575eee1",
+      "1689ffbbd1bedaf55d65c183e46b948584c59a4f",
+      "934dfa18c4edf79d3d1bb9d019e132e3a2ccb4cb",
+      "0ca6acd84db9083bb12d97d981d15d118bb6c358",
+      "23c186c12ba13f20e1ae8b842744d2cee49335fa",
+      "73eb2583ba3df23cabba361f21fbc8e88c61f0f1",
+      "689b7d68d10cc4f34b8ab4bb69d9ac7433072dbd",
+      "5d460db25f200d3dd79d287c35b9fad8302b99ad",
+      "68776a67c1bba7c15448d0d03787cac1a6af5ba5",
+      "c014bc93b784383bdbb762ce1c29a7684421abcd",
+      "502075a1259ea09502b2a3b38d601105bf2c3a88",
+      "eaa2ca08d2e98404f3f2e780188845c38871fefd",
+      "d0ce75ba0ccf2ea866555f02fdb6ee0df3db73be",
+      "43e57a3910da4a6ba8775803433614bc62eec593",
+      "3b49083eea72992052b47049c25030317ee38350",
+      "322e4c2a268942704faebccc35bff76750d5b717",
+      "687baae8b02c275885740f9813b0314d01eccc29",
+      "3da98a20de84e02b886913aa8a48696b6c6f6e4a",
+      "754731313959dc425136f2c024e2ebf5c1a692f6",
+      "6b61ebbee0be137baa887f5ddfacfc5ffce32935",
+      "76a11d5bf98b9fad038630294c10e7727b153604",
+      "dfd6516fedce0599641bb6a6cac38c018d1eadf1",
+      "9e0bfcc2eef0b448f12ad9c2185263ad60a80d1a",
+      "141295c25f7e7bc7aab2d07f4dc152fc1f0e572b",
+      "7370a764acf7889b080abafe7bf4f559b032f2d6",
+      "1cbcc28795249c2ef38d7e096910ac5c64b25342",
+      "f396b94272feb7fe8caf31042fdeb0b3ee5e610e",
+      "6f77a7532711ea76163ac953e8776bd646f35ad3",
+      "efc680dfba84c2657fb9def8193dad4717e8f062",
+      "5b165e5edea32c14ee830d543999b7792a100501",
+      "768b5fb0e9efbd1180e5082d169cf264645dd4d4",
+      "024b9e9f9a453de2b9481fbce5d9d403de7f4e71",
+      "d9e63bf77be851d5a7389f74e3bb3dcb2c17b1fe",
+      "872b45c4c78df134d79b97e17ab221b380ebae1f",
+      "b16692af73059e4ac03e53a750ff480dde609c2a",
+      "d4c1ffb716db71d4721369e8b79b06b81569b114",
+      "b397ee3fdebe14d2a2c6135ae1e0f92d981ce484",
+      "90c7d3f1d2294b59aa326e24c04944b3d92e40e7",
+      "d5f0e84c83861fe3372054f18c684ed538991fee",
+      "41cb32e21c791f8be6ead8d820b51782560a09c9",
+      "507495471cc1ad0847a482370e4e6451907fec25",
+      "cdf34c7dc3242fb44f95b9031eb69e0cdcfeee21",
+      "04825a69bc54e81c882c9deb63c547bf76c48006",
+      "d901cbcad79bfeb3fa13dd72e05ab1fc893e656e",
+      "567fa007448bb0f6ec406ad090799cc818960f43",
+      "f87ee93c2b8ac3a95e97284d78b087958941f1b5",
+      "9760189cb3da3e0b5a29084d00cf17525b920713",
+      "52bd35218fcd50632cc33c3860e6608a807afb6c",
+      "a21ba7e56670cba6dc8b2955668f9673772e53b5",
+      "34c0f2d3f3b419d9c34ae37aec68ecf76b6b5b20",
+      "d34c07381b37eae124ff70fccf4789dc6b9507a5",
+      "068516929ae866d45a19b77dba1d99bb8b7cd672",
+      "1293ced8ca467a681b937ba6b9e9f6d8fa7e565d"
+    ]
+  },
+  {
+    "message": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+    "secretKey": "2ac262f662657b89b5cf7a3fffdf0873a49720d1",
+    "publicKey": [
+      "9af5b1da82da2d967d8d349a57e8a76299435108",
+      "e950fa6c6e901079016caf4e88bd8fa1f6222ec2",
+      "49bfe310c329eba822071439046a85df10d5019f",
+      "7ffd6ae64a4034d671137ad9f6e0d1f3a4edbc0e",
+      "7458a610b470982c323bee46ad2ecef4e7181896",
+      "1ddb43dde46dae047c8e30dac0438c764d5a493a",
+      "d7c9fd4a58d5436d90d0c23b68b757ab300c7e17",
+      "8120ad732e9ec383f9a45e2bea0579a7184b04fd",
+      "26355f55d50fe42d7285896894b9124fa53fdc89",
+      "5e4ae9721c7edfaecb80f549d0bdb11537a22dea",
+      "b966f631407bb2824d6383f195716b9e3d04b0d6",
+      "bf63dd80b10ea3aba19da696a408c6ce6dcf0ec3",
+      "738d05d2182b9ecbf8e59b4ca62db4e8c68b8e55",
+      "0f1a8239ee8deea0087a90409d55594eb7d2f616",
+      "fe9a1d41ebe2eab14685bad40c4295fdd8163f44",
+      "a513bd3f2ccdbeb85522c6739d72b92dc31486b5",
+      "178816afe8b5d0e876c6edfea1051da277d7131f",
+      "e8f974ddd86362fbeaae0022ed29aecad7f0c258",
+      "3fd84b336bbc364ae0be4d5bb3a32f778657474d",
+      "554b086be626c2b4d94f3b9696b27e114c394982",
+      "016cb71db3137970c5b6559751987cf3314d58b9",
+      "f385e8a9156653a7064c04bdbaf0f39004c68cdb",
+      "115400f5b38f8e196a3c261e6f78a05b018c953c",
+      "8e6bbacceb3c58ef8896c86f55af31eab3f336ac",
+      "a170970d56fcb5ae4274bb8035c40f7171f9a603",
+      "5d8edbc7b31354fc29643958a5c6d5e7bbc97c47",
+      "c5931e568d46cde45243cd4a6f63eaf7e34454a3",
+      "ec4630f0166b55875298c7392c17bf66cbf915ae",
+      "4c4b59881ec67c8333e51b62cb1f178bcd9573ae",
+      "632d6320f339776f09c9972b3397bb0bb2c1d179",
+      "ce1089da0e4f5ed8e9de6e3f65dbc32b7a4dcf52",
+      "7bf6a6dee764ce650ea3327b9c80e9f7f71fdc12",
+      "e338edee25b3a145e752a3c6db60ff53bef6e2e3",
+      "e0edd6faf8bb63e2de1c762c5322d97a60f9a578",
+      "56dbfc7f6083fb57ad3349ef66d02809403bb331",
+      "7d829577619f82d35476db94ff48451e7d1100a5",
+      "db78430ba87767b515e9563ff99524bc5bff3ea7",
+      "54a51ef787208093d61d9cb6ea59919db6333c32",
+      "5184a252e4c87a6ffb45a405e16e427c4221b876",
+      "0948c60330a9072b84e376686b16d0cdea8f3fca",
+      "ee42be75404a5a5f8f9bcd8014f6e5e67431b51e",
+      "01a3dd6d2566c676e7c3bfed53b8a33203618aa2",
+      "5052aded9951a95a772d9f94f1691b4f04b5c7d1",
+      "012ca641e78d74ff6ef898f67f71708a5978d5f3",
+      "fc4f65e6846fc13c87a0b765dd9dca87af50822f",
+      "d3658da06b0ed793d6c6e69c2bba5249e6dd6a9b",
+      "8612bb541f2aa6a36dda3ce90075f5c41c5afaff",
+      "00beedfd41779345739a0bc468c0dd4f1a788120",
+      "6936510409bd57edf7238cd82dcfef2653b88336",
+      "3dadf00b3193222757a99da8dcace613121e59a4",
+      "400a568bcf3c266f7f0a107bddb6113c8a6e6054",
+      "8ad34651becd455d175fe0421ee0a28d75914c2a",
+      "203b513b3bf9a173a8b022034935e668bc0a8116",
+      "f24cb584f9dd5967392584ccb59ffa492a3d44fc",
+      "e91ac678577f8c611e4136e299b3eeabdf48ae4f",
+      "c3c62acf416f65292085e73f321ac4c9542c7c4a",
+      "6f18a4c61af2f9a2da2274a0cee3505914d4d9b4",
+      "290f206a13c5813cf7afab12b46af9823c8020f0",
+      "9409004ab94e29eaf729f31e33180d0f58d97506",
+      "3f5fc3edbadeda4ee7d5a8eb88b83be786b0b208",
+      "f680ef69688133d92b20e3d1645e24fd5ffb809d",
+      "84a2275a4e9802a411b00dc2f97770a7fe644b5d",
+      "a252e1cac3967040d7642040c5f225efaad43201",
+      "3bfc586e7dc48ba633e47172fb8d16262fe19567",
+      "53a7b403947a0fc3f76a1672663e135f7c7bd1e4",
+      "bbb8c31d841624fc00cd794d3aac60db35bc9ca3",
+      "aec7a1788a207b0ebb806be6d41371fdf5bb83b0"
+    ],
+    "witness": [
+      "9af5b1da82da2d967d8d349a57e8a76299435108",
+      "0f",
+      "e950fa6c6e901079016caf4e88bd8fa1f6222ec2",
+      "0f",
+      "49bfe310c329eba822071439046a85df10d5019f",
+      "0f",
+      "7ffd6ae64a4034d671137ad9f6e0d1f3a4edbc0e",
+      "0f",
+      "7458a610b470982c323bee46ad2ecef4e7181896",
+      "0f",
+      "1ddb43dde46dae047c8e30dac0438c764d5a493a",
+      "0f",
+      "d7c9fd4a58d5436d90d0c23b68b757ab300c7e17",
+      "0f",
+      "8120ad732e9ec383f9a45e2bea0579a7184b04fd",
+      "0f",
+      "26355f55d50fe42d7285896894b9124fa53fdc89",
+      "0f",
+      "5e4ae9721c7edfaecb80f549d0bdb11537a22dea",
+      "0f",
+      "b966f631407bb2824d6383f195716b9e3d04b0d6",
+      "0f",
+      "bf63dd80b10ea3aba19da696a408c6ce6dcf0ec3",
+      "0f",
+      "738d05d2182b9ecbf8e59b4ca62db4e8c68b8e55",
+      "0f",
+      "0f1a8239ee8deea0087a90409d55594eb7d2f616",
+      "0f",
+      "fe9a1d41ebe2eab14685bad40c4295fdd8163f44",
+      "0f",
+      "a513bd3f2ccdbeb85522c6739d72b92dc31486b5",
+      "0f",
+      "178816afe8b5d0e876c6edfea1051da277d7131f",
+      "0f",
+      "e8f974ddd86362fbeaae0022ed29aecad7f0c258",
+      "0f",
+      "3fd84b336bbc364ae0be4d5bb3a32f778657474d",
+      "0f",
+      "554b086be626c2b4d94f3b9696b27e114c394982",
+      "0f",
+      "016cb71db3137970c5b6559751987cf3314d58b9",
+      "0f",
+      "f385e8a9156653a7064c04bdbaf0f39004c68cdb",
+      "0f",
+      "115400f5b38f8e196a3c261e6f78a05b018c953c",
+      "0f",
+      "8e6bbacceb3c58ef8896c86f55af31eab3f336ac",
+      "0f",
+      "a170970d56fcb5ae4274bb8035c40f7171f9a603",
+      "0f",
+      "5d8edbc7b31354fc29643958a5c6d5e7bbc97c47",
+      "0f",
+      "c5931e568d46cde45243cd4a6f63eaf7e34454a3",
+      "0f",
+      "ec4630f0166b55875298c7392c17bf66cbf915ae",
+      "0f",
+      "4c4b59881ec67c8333e51b62cb1f178bcd9573ae",
+      "0f",
+      "632d6320f339776f09c9972b3397bb0bb2c1d179",
+      "0f",
+      "ce1089da0e4f5ed8e9de6e3f65dbc32b7a4dcf52",
+      "0f",
+      "7bf6a6dee764ce650ea3327b9c80e9f7f71fdc12",
+      "0f",
+      "e338edee25b3a145e752a3c6db60ff53bef6e2e3",
+      "0f",
+      "e0edd6faf8bb63e2de1c762c5322d97a60f9a578",
+      "0f",
+      "56dbfc7f6083fb57ad3349ef66d02809403bb331",
+      "0f",
+      "7d829577619f82d35476db94ff48451e7d1100a5",
+      "0f",
+      "db78430ba87767b515e9563ff99524bc5bff3ea7",
+      "0f",
+      "54a51ef787208093d61d9cb6ea59919db6333c32",
+      "0f",
+      "5184a252e4c87a6ffb45a405e16e427c4221b876",
+      "0f",
+      "0948c60330a9072b84e376686b16d0cdea8f3fca",
+      "0f",
+      "ee42be75404a5a5f8f9bcd8014f6e5e67431b51e",
+      "0f",
+      "01a3dd6d2566c676e7c3bfed53b8a33203618aa2",
+      "0f",
+      "5052aded9951a95a772d9f94f1691b4f04b5c7d1",
+      "0f",
+      "012ca641e78d74ff6ef898f67f71708a5978d5f3",
+      "0f",
+      "fc4f65e6846fc13c87a0b765dd9dca87af50822f",
+      "0f",
+      "d3658da06b0ed793d6c6e69c2bba5249e6dd6a9b",
+      "0f",
+      "8612bb541f2aa6a36dda3ce90075f5c41c5afaff",
+      "0f",
+      "00beedfd41779345739a0bc468c0dd4f1a788120",
+      "0f",
+      "6936510409bd57edf7238cd82dcfef2653b88336",
+      "0f",
+      "3dadf00b3193222757a99da8dcace613121e59a4",
+      "0f",
+      "400a568bcf3c266f7f0a107bddb6113c8a6e6054",
+      "0f",
+      "8ad34651becd455d175fe0421ee0a28d75914c2a",
+      "0f",
+      "203b513b3bf9a173a8b022034935e668bc0a8116",
+      "0f",
+      "f24cb584f9dd5967392584ccb59ffa492a3d44fc",
+      "0f",
+      "e91ac678577f8c611e4136e299b3eeabdf48ae4f",
+      "0f",
+      "c3c62acf416f65292085e73f321ac4c9542c7c4a",
+      "0f",
+      "6f18a4c61af2f9a2da2274a0cee3505914d4d9b4",
+      "0f",
+      "290f206a13c5813cf7afab12b46af9823c8020f0",
+      "0f",
+      "9409004ab94e29eaf729f31e33180d0f58d97506",
+      "0f",
+      "3f5fc3edbadeda4ee7d5a8eb88b83be786b0b208",
+      "0f",
+      "f680ef69688133d92b20e3d1645e24fd5ffb809d",
+      "0f",
+      "84a2275a4e9802a411b00dc2f97770a7fe644b5d",
+      "0f",
+      "a252e1cac3967040d7642040c5f225efaad43201",
+      "0f",
+      "3bfc586e7dc48ba633e47172fb8d16262fe19567",
+      "0f",
+      "1d2fc7ed4e7a697ca91d650659fccb5cac2bfbb0",
+      "",
+      "c595ae18d9e30261bd9caac494462201dbf6209f",
+      "",
+      "435b4196ea839c4d5a95479c065c88eb0fb2d1ae",
+      ""
+    ],
+    "signature": [
+      "9af5b1da82da2d967d8d349a57e8a762994351080f",
+      "e950fa6c6e901079016caf4e88bd8fa1f6222ec20f",
+      "49bfe310c329eba822071439046a85df10d5019f0f",
+      "7ffd6ae64a4034d671137ad9f6e0d1f3a4edbc0e0f",
+      "7458a610b470982c323bee46ad2ecef4e71818960f",
+      "1ddb43dde46dae047c8e30dac0438c764d5a493a0f",
+      "d7c9fd4a58d5436d90d0c23b68b757ab300c7e170f",
+      "8120ad732e9ec383f9a45e2bea0579a7184b04fd0f",
+      "26355f55d50fe42d7285896894b9124fa53fdc890f",
+      "5e4ae9721c7edfaecb80f549d0bdb11537a22dea0f",
+      "b966f631407bb2824d6383f195716b9e3d04b0d60f",
+      "bf63dd80b10ea3aba19da696a408c6ce6dcf0ec30f",
+      "738d05d2182b9ecbf8e59b4ca62db4e8c68b8e550f",
+      "0f1a8239ee8deea0087a90409d55594eb7d2f6160f",
+      "fe9a1d41ebe2eab14685bad40c4295fdd8163f440f",
+      "a513bd3f2ccdbeb85522c6739d72b92dc31486b50f",
+      "178816afe8b5d0e876c6edfea1051da277d7131f0f",
+      "e8f974ddd86362fbeaae0022ed29aecad7f0c2580f",
+      "3fd84b336bbc364ae0be4d5bb3a32f778657474d0f",
+      "554b086be626c2b4d94f3b9696b27e114c3949820f",
+      "016cb71db3137970c5b6559751987cf3314d58b90f",
+      "f385e8a9156653a7064c04bdbaf0f39004c68cdb0f",
+      "115400f5b38f8e196a3c261e6f78a05b018c953c0f",
+      "8e6bbacceb3c58ef8896c86f55af31eab3f336ac0f",
+      "a170970d56fcb5ae4274bb8035c40f7171f9a6030f",
+      "5d8edbc7b31354fc29643958a5c6d5e7bbc97c470f",
+      "c5931e568d46cde45243cd4a6f63eaf7e34454a30f",
+      "ec4630f0166b55875298c7392c17bf66cbf915ae0f",
+      "4c4b59881ec67c8333e51b62cb1f178bcd9573ae0f",
+      "632d6320f339776f09c9972b3397bb0bb2c1d1790f",
+      "ce1089da0e4f5ed8e9de6e3f65dbc32b7a4dcf520f",
+      "7bf6a6dee764ce650ea3327b9c80e9f7f71fdc120f",
+      "e338edee25b3a145e752a3c6db60ff53bef6e2e30f",
+      "e0edd6faf8bb63e2de1c762c5322d97a60f9a5780f",
+      "56dbfc7f6083fb57ad3349ef66d02809403bb3310f",
+      "7d829577619f82d35476db94ff48451e7d1100a50f",
+      "db78430ba87767b515e9563ff99524bc5bff3ea70f",
+      "54a51ef787208093d61d9cb6ea59919db6333c320f",
+      "5184a252e4c87a6ffb45a405e16e427c4221b8760f",
+      "0948c60330a9072b84e376686b16d0cdea8f3fca0f",
+      "ee42be75404a5a5f8f9bcd8014f6e5e67431b51e0f",
+      "01a3dd6d2566c676e7c3bfed53b8a33203618aa20f",
+      "5052aded9951a95a772d9f94f1691b4f04b5c7d10f",
+      "012ca641e78d74ff6ef898f67f71708a5978d5f30f",
+      "fc4f65e6846fc13c87a0b765dd9dca87af50822f0f",
+      "d3658da06b0ed793d6c6e69c2bba5249e6dd6a9b0f",
+      "8612bb541f2aa6a36dda3ce90075f5c41c5afaff0f",
+      "00beedfd41779345739a0bc468c0dd4f1a7881200f",
+      "6936510409bd57edf7238cd82dcfef2653b883360f",
+      "3dadf00b3193222757a99da8dcace613121e59a40f",
+      "400a568bcf3c266f7f0a107bddb6113c8a6e60540f",
+      "8ad34651becd455d175fe0421ee0a28d75914c2a0f",
+      "203b513b3bf9a173a8b022034935e668bc0a81160f",
+      "f24cb584f9dd5967392584ccb59ffa492a3d44fc0f",
+      "e91ac678577f8c611e4136e299b3eeabdf48ae4f0f",
+      "c3c62acf416f65292085e73f321ac4c9542c7c4a0f",
+      "6f18a4c61af2f9a2da2274a0cee3505914d4d9b40f",
+      "290f206a13c5813cf7afab12b46af9823c8020f00f",
+      "9409004ab94e29eaf729f31e33180d0f58d975060f",
+      "3f5fc3edbadeda4ee7d5a8eb88b83be786b0b2080f",
+      "f680ef69688133d92b20e3d1645e24fd5ffb809d0f",
+      "84a2275a4e9802a411b00dc2f97770a7fe644b5d0f",
+      "a252e1cac3967040d7642040c5f225efaad432010f",
+      "3bfc586e7dc48ba633e47172fb8d16262fe195670f",
+      "1d2fc7ed4e7a697ca91d650659fccb5cac2bfbb000",
+      "c595ae18d9e30261bd9caac494462201dbf6209f00",
+      "435b4196ea839c4d5a95479c065c88eb0fb2d1ae00"
+    ],
+    "compact_witness": [
+      "9af5b1da82da2d967d8d349a57e8a76299435108",
+      "e950fa6c6e901079016caf4e88bd8fa1f6222ec2",
+      "49bfe310c329eba822071439046a85df10d5019f",
+      "7ffd6ae64a4034d671137ad9f6e0d1f3a4edbc0e",
+      "7458a610b470982c323bee46ad2ecef4e7181896",
+      "1ddb43dde46dae047c8e30dac0438c764d5a493a",
+      "d7c9fd4a58d5436d90d0c23b68b757ab300c7e17",
+      "8120ad732e9ec383f9a45e2bea0579a7184b04fd",
+      "26355f55d50fe42d7285896894b9124fa53fdc89",
+      "5e4ae9721c7edfaecb80f549d0bdb11537a22dea",
+      "b966f631407bb2824d6383f195716b9e3d04b0d6",
+      "bf63dd80b10ea3aba19da696a408c6ce6dcf0ec3",
+      "738d05d2182b9ecbf8e59b4ca62db4e8c68b8e55",
+      "0f1a8239ee8deea0087a90409d55594eb7d2f616",
+      "fe9a1d41ebe2eab14685bad40c4295fdd8163f44",
+      "a513bd3f2ccdbeb85522c6739d72b92dc31486b5",
+      "178816afe8b5d0e876c6edfea1051da277d7131f",
+      "e8f974ddd86362fbeaae0022ed29aecad7f0c258",
+      "3fd84b336bbc364ae0be4d5bb3a32f778657474d",
+      "554b086be626c2b4d94f3b9696b27e114c394982",
+      "016cb71db3137970c5b6559751987cf3314d58b9",
+      "f385e8a9156653a7064c04bdbaf0f39004c68cdb",
+      "115400f5b38f8e196a3c261e6f78a05b018c953c",
+      "8e6bbacceb3c58ef8896c86f55af31eab3f336ac",
+      "a170970d56fcb5ae4274bb8035c40f7171f9a603",
+      "5d8edbc7b31354fc29643958a5c6d5e7bbc97c47",
+      "c5931e568d46cde45243cd4a6f63eaf7e34454a3",
+      "ec4630f0166b55875298c7392c17bf66cbf915ae",
+      "4c4b59881ec67c8333e51b62cb1f178bcd9573ae",
+      "632d6320f339776f09c9972b3397bb0bb2c1d179",
+      "ce1089da0e4f5ed8e9de6e3f65dbc32b7a4dcf52",
+      "7bf6a6dee764ce650ea3327b9c80e9f7f71fdc12",
+      "e338edee25b3a145e752a3c6db60ff53bef6e2e3",
+      "e0edd6faf8bb63e2de1c762c5322d97a60f9a578",
+      "56dbfc7f6083fb57ad3349ef66d02809403bb331",
+      "7d829577619f82d35476db94ff48451e7d1100a5",
+      "db78430ba87767b515e9563ff99524bc5bff3ea7",
+      "54a51ef787208093d61d9cb6ea59919db6333c32",
+      "5184a252e4c87a6ffb45a405e16e427c4221b876",
+      "0948c60330a9072b84e376686b16d0cdea8f3fca",
+      "ee42be75404a5a5f8f9bcd8014f6e5e67431b51e",
+      "01a3dd6d2566c676e7c3bfed53b8a33203618aa2",
+      "5052aded9951a95a772d9f94f1691b4f04b5c7d1",
+      "012ca641e78d74ff6ef898f67f71708a5978d5f3",
+      "fc4f65e6846fc13c87a0b765dd9dca87af50822f",
+      "d3658da06b0ed793d6c6e69c2bba5249e6dd6a9b",
+      "8612bb541f2aa6a36dda3ce90075f5c41c5afaff",
+      "00beedfd41779345739a0bc468c0dd4f1a788120",
+      "6936510409bd57edf7238cd82dcfef2653b88336",
+      "3dadf00b3193222757a99da8dcace613121e59a4",
+      "400a568bcf3c266f7f0a107bddb6113c8a6e6054",
+      "8ad34651becd455d175fe0421ee0a28d75914c2a",
+      "203b513b3bf9a173a8b022034935e668bc0a8116",
+      "f24cb584f9dd5967392584ccb59ffa492a3d44fc",
+      "e91ac678577f8c611e4136e299b3eeabdf48ae4f",
+      "c3c62acf416f65292085e73f321ac4c9542c7c4a",
+      "6f18a4c61af2f9a2da2274a0cee3505914d4d9b4",
+      "290f206a13c5813cf7afab12b46af9823c8020f0",
+      "9409004ab94e29eaf729f31e33180d0f58d97506",
+      "3f5fc3edbadeda4ee7d5a8eb88b83be786b0b208",
+      "f680ef69688133d92b20e3d1645e24fd5ffb809d",
+      "84a2275a4e9802a411b00dc2f97770a7fe644b5d",
+      "a252e1cac3967040d7642040c5f225efaad43201",
+      "3bfc586e7dc48ba633e47172fb8d16262fe19567",
+      "1d2fc7ed4e7a697ca91d650659fccb5cac2bfbb0",
+      "c595ae18d9e30261bd9caac494462201dbf6209f",
+      "435b4196ea839c4d5a95479c065c88eb0fb2d1ae"
+    ],
+    "compact_signature": [
+      "9af5b1da82da2d967d8d349a57e8a76299435108",
+      "e950fa6c6e901079016caf4e88bd8fa1f6222ec2",
+      "49bfe310c329eba822071439046a85df10d5019f",
+      "7ffd6ae64a4034d671137ad9f6e0d1f3a4edbc0e",
+      "7458a610b470982c323bee46ad2ecef4e7181896",
+      "1ddb43dde46dae047c8e30dac0438c764d5a493a",
+      "d7c9fd4a58d5436d90d0c23b68b757ab300c7e17",
+      "8120ad732e9ec383f9a45e2bea0579a7184b04fd",
+      "26355f55d50fe42d7285896894b9124fa53fdc89",
+      "5e4ae9721c7edfaecb80f549d0bdb11537a22dea",
+      "b966f631407bb2824d6383f195716b9e3d04b0d6",
+      "bf63dd80b10ea3aba19da696a408c6ce6dcf0ec3",
+      "738d05d2182b9ecbf8e59b4ca62db4e8c68b8e55",
+      "0f1a8239ee8deea0087a90409d55594eb7d2f616",
+      "fe9a1d41ebe2eab14685bad40c4295fdd8163f44",
+      "a513bd3f2ccdbeb85522c6739d72b92dc31486b5",
+      "178816afe8b5d0e876c6edfea1051da277d7131f",
+      "e8f974ddd86362fbeaae0022ed29aecad7f0c258",
+      "3fd84b336bbc364ae0be4d5bb3a32f778657474d",
+      "554b086be626c2b4d94f3b9696b27e114c394982",
+      "016cb71db3137970c5b6559751987cf3314d58b9",
+      "f385e8a9156653a7064c04bdbaf0f39004c68cdb",
+      "115400f5b38f8e196a3c261e6f78a05b018c953c",
+      "8e6bbacceb3c58ef8896c86f55af31eab3f336ac",
+      "a170970d56fcb5ae4274bb8035c40f7171f9a603",
+      "5d8edbc7b31354fc29643958a5c6d5e7bbc97c47",
+      "c5931e568d46cde45243cd4a6f63eaf7e34454a3",
+      "ec4630f0166b55875298c7392c17bf66cbf915ae",
+      "4c4b59881ec67c8333e51b62cb1f178bcd9573ae",
+      "632d6320f339776f09c9972b3397bb0bb2c1d179",
+      "ce1089da0e4f5ed8e9de6e3f65dbc32b7a4dcf52",
+      "7bf6a6dee764ce650ea3327b9c80e9f7f71fdc12",
+      "e338edee25b3a145e752a3c6db60ff53bef6e2e3",
+      "e0edd6faf8bb63e2de1c762c5322d97a60f9a578",
+      "56dbfc7f6083fb57ad3349ef66d02809403bb331",
+      "7d829577619f82d35476db94ff48451e7d1100a5",
+      "db78430ba87767b515e9563ff99524bc5bff3ea7",
+      "54a51ef787208093d61d9cb6ea59919db6333c32",
+      "5184a252e4c87a6ffb45a405e16e427c4221b876",
+      "0948c60330a9072b84e376686b16d0cdea8f3fca",
+      "ee42be75404a5a5f8f9bcd8014f6e5e67431b51e",
+      "01a3dd6d2566c676e7c3bfed53b8a33203618aa2",
+      "5052aded9951a95a772d9f94f1691b4f04b5c7d1",
+      "012ca641e78d74ff6ef898f67f71708a5978d5f3",
+      "fc4f65e6846fc13c87a0b765dd9dca87af50822f",
+      "d3658da06b0ed793d6c6e69c2bba5249e6dd6a9b",
+      "8612bb541f2aa6a36dda3ce90075f5c41c5afaff",
+      "00beedfd41779345739a0bc468c0dd4f1a788120",
+      "6936510409bd57edf7238cd82dcfef2653b88336",
+      "3dadf00b3193222757a99da8dcace613121e59a4",
+      "400a568bcf3c266f7f0a107bddb6113c8a6e6054",
+      "8ad34651becd455d175fe0421ee0a28d75914c2a",
+      "203b513b3bf9a173a8b022034935e668bc0a8116",
+      "f24cb584f9dd5967392584ccb59ffa492a3d44fc",
+      "e91ac678577f8c611e4136e299b3eeabdf48ae4f",
+      "c3c62acf416f65292085e73f321ac4c9542c7c4a",
+      "6f18a4c61af2f9a2da2274a0cee3505914d4d9b4",
+      "290f206a13c5813cf7afab12b46af9823c8020f0",
+      "9409004ab94e29eaf729f31e33180d0f58d97506",
+      "3f5fc3edbadeda4ee7d5a8eb88b83be786b0b208",
+      "f680ef69688133d92b20e3d1645e24fd5ffb809d",
+      "84a2275a4e9802a411b00dc2f97770a7fe644b5d",
+      "a252e1cac3967040d7642040c5f225efaad43201",
+      "3bfc586e7dc48ba633e47172fb8d16262fe19567",
+      "1d2fc7ed4e7a697ca91d650659fccb5cac2bfbb0",
+      "c595ae18d9e30261bd9caac494462201dbf6209f",
+      "435b4196ea839c4d5a95479c065c88eb0fb2d1ae"
+    ]
+  },
+  {
+    "message": "82d65fa0022898297cc3f63ea468ac33b7eba1f7a575f3ad519e6ba4952bc7cb",
+    "secretKey": "462ca950a528241c2a867e56404cefc537d06ad2",
+    "publicKey": [
+      "38cb3a41e6ebcf90d502fb186ef3666e9f05cce8",
+      "e56bf327009b1e6f8de8109c94721d93e9844ef1",
+      "874f323c4178c46101a85e8bd99ee8665759f9b9",
+      "433190f41c61a25a7e2b37434b43b323cdacd515",
+      "0ba3ebee7cacd5100b65934ac58558149580f27e",
+      "390198f04b2497039857d54ff5eef458cfe947d0",
+      "416c83c24ab82908f10fcba9fbe2e5c911340f64",
+      "8b66adfe4148c787f19a132f5ee01a8f2c6f6d5e",
+      "fc60efce02bc1393d210f618a5e10f539b7c3697",
+      "ae94fb8878acdfe24f252481f1c8ae05fe25e54a",
+      "fc721293f64a5248c32230c0f34d9859b2bcd5af",
+      "beb302299c86fc1ac0b779acd13908c346026867",
+      "7987891ab20d62158fa50692c6581e60d918f181",
+      "614cef5b983bfd35c73cdad4407b97af7a90b397",
+      "b31d8811a3298964d7f4d0da31ef5a55d99f100c",
+      "1a6e466889ecbd9d219efa55db26d157eca0b3d4",
+      "5b56f919bfdfd6c179a1b9bef3f054c9eb776521",
+      "2edd913e7a8df53976a9cb4058b971e2f41362a7",
+      "e242e14943c845a946ae4451b0bb04564defd9bf",
+      "ce01f6949afe223cd5908be974de2dc9f19f9318",
+      "3329b5fbb95c2d9d102d8aee86e0ae8b9cb73ff5",
+      "7718878695e8c6069b179653f87cd60f1f53e535",
+      "c8924a546d8b338fd47c1e697decd16109baf08b",
+      "cb505c70b93e57ed1d3949efabc17e55f60b6e3e",
+      "02fe11a9648e84e88cfd595b0d4150b354aa1e6b",
+      "652f860e63a4c7ad51ee1e133ba0f5d22c4a506f",
+      "3f8da8fa6a6907ed49304b23bb6dd16ffabfbe2c",
+      "51ee57e85af90a410ddca27d7907fa987396c319",
+      "4957b1793d6ef0263d177a774f11a175f705c63a",
+      "ecf687b12b21f39c9a2409af3d8387957a0d42ae",
+      "7b11253b187b74cab9c3359afb2f47c07bb06ac0",
+      "6ec2303828a817d68bb79a5d9389db268f4613d8",
+      "69f1164268e7980c664911a3833779deef5f04b6",
+      "be6ab9bfbdf7d9593e95a71edb7f226245fc2d86",
+      "84645fe2d36ee6c2a3b14533c2698c351c938a1e",
+      "321e8150cf1f29e2b923590000b789803849290f",
+      "72b7405b90846119938a1c96b2d870205c5dc9f2",
+      "7edb67ecda52c06f9a631399f38ff1af8e155cba",
+      "fb8f16300dfac0d4c7732577c8782bfe2671da84",
+      "130f96e4d69143a8a7fc18e7d518d570100e49ed",
+      "a344f3896c2e942d76dda484e24c806207c7887b",
+      "3029957814f6f160b077992a22088a2690fea032",
+      "7847c6f270f228009cd48650ec68556c2ffd32a1",
+      "89118e9506528ffc55442a65254d149afac93bbf",
+      "f5dd72975cb974cc436d2cd6dda486daea56a165",
+      "737e2cf41ebac02a5bba407bfd7c646429cf0fda",
+      "624ece53964ef036e634c1b9b6f06e415400d806",
+      "528c2e3778245fa146db3287b82b26e09692fdf5",
+      "66a4642a4e8065c9111c2b55397ad47b5be4402b",
+      "acc96ee5a94d6eb9dba8da95f90ae8707c326b24",
+      "39099b8df8951c2ae7449aa714bedfb4e65268c5",
+      "61d5f4f350063c3bdc6786869faa70b548decdf9",
+      "4280c041b20621d2452ac92869b73842add0d816",
+      "0cb5847629521e63b721988b9b692d9b0f76b2a2",
+      "491325bd099204f9e6718f56c3b042592176b2e2",
+      "7f211215db8a8e6a42dab72bac87b6d7a0a3bade",
+      "8609a72d5e28b315ea505ae8dfc781115670c912",
+      "b9302226c318019a3e1eed31786f78dd044f09b1",
+      "ef68c049b279e99da1cb292e78bdbc7ba6ac0c8c",
+      "9e2c2b4b5117877d452b42f026ab5cdd728a2019",
+      "437d529df6931cf88248367c22c9db85a86135ba",
+      "0f0d5eaad939fe18f6e6283b9a8f2579924aa553",
+      "06a570d75243f55868c5ec23ef3025b6de7e49ec",
+      "32b79e303df8567ad2804b5ab5d72c95bf4852d7",
+      "517007fc1d53cceb356860b7a817ad1d853cb7a5",
+      "5934d13e0b13ef8d447b1f2193b1162e37f289dd",
+      "b671e989d16dc54a32a389efbf6e0211ed4ba7f6"
+    ],
+    "witness": [
+      "6ca9edc5cb165323e7ccd9056a0070d4369bbde4",
+      "0c",
+      "3df41fdfc6b634fd652bf479d0f9889bb78d93b0",
+      "0b",
+      "94fb70be4c3bc27228a9c6b59dffeeecf2211cf2",
+      "0c",
+      "b5b43eddb541f09554f5ad42e1514d8d54b79a04",
+      "07",
+      "9e80edd4d16abd73fe8eab3eceefa44748dbf27d",
+      "02",
+      "6555cdbaf98edf9c23621da0a60c1bfa29ae8832",
+      "0b",
+      "87978314688359ffcfba7907af3ff9df5d32642e",
+      "09",
+      "1925a77713c5a0845c13bb310c60fd7b0fa66617",
+      "05",
+      "891a55536e04998f918c7392d320d572dd946b73",
+      "0a",
+      "64a00350512395c0ae7c35b51c215d3e3eb37c97",
+      "04",
+      "be5109155da4ea68aea1a89807ab59ee5bb0a398",
+      "06",
+      "f258b0b4f384d888213a8adfca17e855a57f435b",
+      "0b",
+      "a7c788345ea5664b3ac68a5812ab13fe5a7ce638",
+      "09",
+      "6f35c942138d553f95369b9516e784a5bcb0d31b",
+      "0e",
+      "aef26d19f0fa405a57917110ea4342814660c82a",
+      "05",
+      "ecff18e118377ce2d1b2732eeeafb95f275a741f",
+      "01",
+      "68ab0605867d286c1b96706e18a2e9f47fc1f019",
+      "0a",
+      "d64fe9ead3eb05f3ae7d8358eabac19192bb4555",
+      "0d",
+      "e242e14943c845a946ae4451b0bb04564defd9bf",
+      "0f",
+      "fefa1c69f37f60a0ca5eaba9a472ea6c780fd85b",
+      "03",
+      "fb4aab6308539dc65a63b6d7a9f97a95760d1f5f",
+      "07",
+      "798a6adb3cbca976321cb3581afe8d60eaadded2",
+      "05",
+      "fda3fabee0c5cd0b996db614693dcc0bbf9799e3",
+      "0a",
+      "51ff164d38d01e75e9f6db672df0654a2674b1f0",
+      "05",
+      "02fe11a9648e84e88cfd595b0d4150b354aa1e6b",
+      "0f",
+      "7cbe23d395cf8f8589bb480ba5194dfc2b97ea59",
+      "07",
+      "c440914670a662f494e28b72dd95afcd598ffc64",
+      "0a",
+      "277ae981e0895788e100afe05796254dc969a665",
+      "01",
+      "c2628a3ac91b0bcab08871d327f91ba06c199b5a",
+      "0e",
+      "97a6edfebfd53682bb1772ea2e1b2fe12d1e465b",
+      "0b",
+      "50102838c3ff0880dd246fb58f0efc8089685722",
+      "0b",
+      "5a09adf1b165b80b9f81a8beb4144d801e99c993",
+      "07",
+      "04aea0cd57aa249cfbd761bc7d13f3e8581c1ad9",
+      "03",
+      "ad266829fbd925fe1ce1c88e92777394456e0153",
+      "03",
+      "b7fdbd7df69e0cd42c4511341cb23589e41d304e",
+      "0a",
+      "37d364a48d568d7ca82a2ea79c778a0d62c503da",
+      "0c",
+      "b6d98ca02c6865d8b9faf3ea8a9c42b4f62efc28",
+      "06",
+      "5a16daea36abad79b0c8643485e9ff413d6d2342",
+      "08",
+      "275b351767728ec7c0a76db10b9ab612728af497",
+      "0a",
+      "fe5c93521676a7c1f0de8b6e5ac8f807582643c5",
+      "04",
+      "ff74f5268e7b40705b73e8e615e157aa9994fbba",
+      "03",
+      "75c488bbd80d6348e4e23fc0b0505a300c1f3e30",
+      "0e",
+      "7847c6f270f228009cd48650ec68556c2ffd32a1",
+      "0f",
+      "f7f3a7482f1b244f4645aabd68df2952f2c36cea",
+      "06",
+      "f1ef3677b72461435611485c95408125cd9e160d",
+      "0c",
+      "e237676c54d5e44c2c3b5038777e3d83fa906696",
+      "03",
+      "8a9408232904b898f63df0cf1711d18f6aa613e6",
+      "07",
+      "0d0d0fc870828a05026e2074e67ebdd11dda1e1b",
+      "0c",
+      "b8efa7e7c43e9408b64f7e050a8ba3688189d45f",
+      "02",
+      "7b623f1c1688261f0cf1d2befca93ec0231d0a14",
+      "09",
+      "7496770c2e7168105c369dc781c758bc57fe6d28",
+      "09",
+      "05fc5746eeb6c0a0528debcc40b2225680deb44a",
+      "08",
+      "4423eacab47d6c18706caf6ad2e2597f173d9638",
+      "02",
+      "850c2597c4fb195f5ac1c937e19afa069f834220",
+      "08",
+      "f756f149b9ad0fb731a4431588c18d9974e95cd0",
+      "",
+      "287ebb276c587d0d7cae2f7eea993f8a52e2b831",
+      "02",
+      "4718baf7ebd7e60c6a38f880814d78935e78ac60",
+      "0a",
+      "daa355cc864e0fc33354ef41916af2f45aca0614",
+      "",
+      "f8ebffea28f5fa63368081ec1071d409cedaa642",
+      "05",
+      "9e2c2b4b5117877d452b42f026ab5cdd728a2019",
+      "0f",
+      "5831c9f2d5491b0f09c3e3b68746112689811294",
+      "0d",
+      "c0421b85b775acac14425240436ecb5d355ed229",
+      "06",
+      "87fb91272fb2f54d60ff56b7e3572db2f71a038d",
+      "08",
+      "fe0f08309430a9178123a69e919012b488402ddf",
+      "02",
+      "5002ff197be8783380522a5e574ac18e82c5b7d3",
+      "01",
+      "f2f51b57265e3c233c979781b9f161e6a05d7a68",
+      "0c",
+      "ebfe54a632a6d810d408bd4829cefeac7a6e72ea",
+      "0c"
+    ],
+    "signature": [
+      "6ca9edc5cb165323e7ccd9056a0070d4369bbde40c",
+      "3df41fdfc6b634fd652bf479d0f9889bb78d93b00b",
+      "94fb70be4c3bc27228a9c6b59dffeeecf2211cf20c",
+      "b5b43eddb541f09554f5ad42e1514d8d54b79a0407",
+      "9e80edd4d16abd73fe8eab3eceefa44748dbf27d02",
+      "6555cdbaf98edf9c23621da0a60c1bfa29ae88320b",
+      "87978314688359ffcfba7907af3ff9df5d32642e09",
+      "1925a77713c5a0845c13bb310c60fd7b0fa6661705",
+      "891a55536e04998f918c7392d320d572dd946b730a",
+      "64a00350512395c0ae7c35b51c215d3e3eb37c9704",
+      "be5109155da4ea68aea1a89807ab59ee5bb0a39806",
+      "f258b0b4f384d888213a8adfca17e855a57f435b0b",
+      "a7c788345ea5664b3ac68a5812ab13fe5a7ce63809",
+      "6f35c942138d553f95369b9516e784a5bcb0d31b0e",
+      "aef26d19f0fa405a57917110ea4342814660c82a05",
+      "ecff18e118377ce2d1b2732eeeafb95f275a741f01",
+      "68ab0605867d286c1b96706e18a2e9f47fc1f0190a",
+      "d64fe9ead3eb05f3ae7d8358eabac19192bb45550d",
+      "e242e14943c845a946ae4451b0bb04564defd9bf0f",
+      "fefa1c69f37f60a0ca5eaba9a472ea6c780fd85b03",
+      "fb4aab6308539dc65a63b6d7a9f97a95760d1f5f07",
+      "798a6adb3cbca976321cb3581afe8d60eaadded205",
+      "fda3fabee0c5cd0b996db614693dcc0bbf9799e30a",
+      "51ff164d38d01e75e9f6db672df0654a2674b1f005",
+      "02fe11a9648e84e88cfd595b0d4150b354aa1e6b0f",
+      "7cbe23d395cf8f8589bb480ba5194dfc2b97ea5907",
+      "c440914670a662f494e28b72dd95afcd598ffc640a",
+      "277ae981e0895788e100afe05796254dc969a66501",
+      "c2628a3ac91b0bcab08871d327f91ba06c199b5a0e",
+      "97a6edfebfd53682bb1772ea2e1b2fe12d1e465b0b",
+      "50102838c3ff0880dd246fb58f0efc80896857220b",
+      "5a09adf1b165b80b9f81a8beb4144d801e99c99307",
+      "04aea0cd57aa249cfbd761bc7d13f3e8581c1ad903",
+      "ad266829fbd925fe1ce1c88e92777394456e015303",
+      "b7fdbd7df69e0cd42c4511341cb23589e41d304e0a",
+      "37d364a48d568d7ca82a2ea79c778a0d62c503da0c",
+      "b6d98ca02c6865d8b9faf3ea8a9c42b4f62efc2806",
+      "5a16daea36abad79b0c8643485e9ff413d6d234208",
+      "275b351767728ec7c0a76db10b9ab612728af4970a",
+      "fe5c93521676a7c1f0de8b6e5ac8f807582643c504",
+      "ff74f5268e7b40705b73e8e615e157aa9994fbba03",
+      "75c488bbd80d6348e4e23fc0b0505a300c1f3e300e",
+      "7847c6f270f228009cd48650ec68556c2ffd32a10f",
+      "f7f3a7482f1b244f4645aabd68df2952f2c36cea06",
+      "f1ef3677b72461435611485c95408125cd9e160d0c",
+      "e237676c54d5e44c2c3b5038777e3d83fa90669603",
+      "8a9408232904b898f63df0cf1711d18f6aa613e607",
+      "0d0d0fc870828a05026e2074e67ebdd11dda1e1b0c",
+      "b8efa7e7c43e9408b64f7e050a8ba3688189d45f02",
+      "7b623f1c1688261f0cf1d2befca93ec0231d0a1409",
+      "7496770c2e7168105c369dc781c758bc57fe6d2809",
+      "05fc5746eeb6c0a0528debcc40b2225680deb44a08",
+      "4423eacab47d6c18706caf6ad2e2597f173d963802",
+      "850c2597c4fb195f5ac1c937e19afa069f83422008",
+      "f756f149b9ad0fb731a4431588c18d9974e95cd000",
+      "287ebb276c587d0d7cae2f7eea993f8a52e2b83102",
+      "4718baf7ebd7e60c6a38f880814d78935e78ac600a",
+      "daa355cc864e0fc33354ef41916af2f45aca061400",
+      "f8ebffea28f5fa63368081ec1071d409cedaa64205",
+      "9e2c2b4b5117877d452b42f026ab5cdd728a20190f",
+      "5831c9f2d5491b0f09c3e3b687461126898112940d",
+      "c0421b85b775acac14425240436ecb5d355ed22906",
+      "87fb91272fb2f54d60ff56b7e3572db2f71a038d08",
+      "fe0f08309430a9178123a69e919012b488402ddf02",
+      "5002ff197be8783380522a5e574ac18e82c5b7d301",
+      "f2f51b57265e3c233c979781b9f161e6a05d7a680c",
+      "ebfe54a632a6d810d408bd4829cefeac7a6e72ea0c"
+    ],
+    "compact_witness": [
+      "6ca9edc5cb165323e7ccd9056a0070d4369bbde4",
+      "3df41fdfc6b634fd652bf479d0f9889bb78d93b0",
+      "94fb70be4c3bc27228a9c6b59dffeeecf2211cf2",
+      "b5b43eddb541f09554f5ad42e1514d8d54b79a04",
+      "9e80edd4d16abd73fe8eab3eceefa44748dbf27d",
+      "6555cdbaf98edf9c23621da0a60c1bfa29ae8832",
+      "87978314688359ffcfba7907af3ff9df5d32642e",
+      "1925a77713c5a0845c13bb310c60fd7b0fa66617",
+      "891a55536e04998f918c7392d320d572dd946b73",
+      "64a00350512395c0ae7c35b51c215d3e3eb37c97",
+      "be5109155da4ea68aea1a89807ab59ee5bb0a398",
+      "f258b0b4f384d888213a8adfca17e855a57f435b",
+      "a7c788345ea5664b3ac68a5812ab13fe5a7ce638",
+      "6f35c942138d553f95369b9516e784a5bcb0d31b",
+      "aef26d19f0fa405a57917110ea4342814660c82a",
+      "ecff18e118377ce2d1b2732eeeafb95f275a741f",
+      "68ab0605867d286c1b96706e18a2e9f47fc1f019",
+      "d64fe9ead3eb05f3ae7d8358eabac19192bb4555",
+      "e242e14943c845a946ae4451b0bb04564defd9bf",
+      "fefa1c69f37f60a0ca5eaba9a472ea6c780fd85b",
+      "fb4aab6308539dc65a63b6d7a9f97a95760d1f5f",
+      "798a6adb3cbca976321cb3581afe8d60eaadded2",
+      "fda3fabee0c5cd0b996db614693dcc0bbf9799e3",
+      "51ff164d38d01e75e9f6db672df0654a2674b1f0",
+      "02fe11a9648e84e88cfd595b0d4150b354aa1e6b",
+      "7cbe23d395cf8f8589bb480ba5194dfc2b97ea59",
+      "c440914670a662f494e28b72dd95afcd598ffc64",
+      "277ae981e0895788e100afe05796254dc969a665",
+      "c2628a3ac91b0bcab08871d327f91ba06c199b5a",
+      "97a6edfebfd53682bb1772ea2e1b2fe12d1e465b",
+      "50102838c3ff0880dd246fb58f0efc8089685722",
+      "5a09adf1b165b80b9f81a8beb4144d801e99c993",
+      "04aea0cd57aa249cfbd761bc7d13f3e8581c1ad9",
+      "ad266829fbd925fe1ce1c88e92777394456e0153",
+      "b7fdbd7df69e0cd42c4511341cb23589e41d304e",
+      "37d364a48d568d7ca82a2ea79c778a0d62c503da",
+      "b6d98ca02c6865d8b9faf3ea8a9c42b4f62efc28",
+      "5a16daea36abad79b0c8643485e9ff413d6d2342",
+      "275b351767728ec7c0a76db10b9ab612728af497",
+      "fe5c93521676a7c1f0de8b6e5ac8f807582643c5",
+      "ff74f5268e7b40705b73e8e615e157aa9994fbba",
+      "75c488bbd80d6348e4e23fc0b0505a300c1f3e30",
+      "7847c6f270f228009cd48650ec68556c2ffd32a1",
+      "f7f3a7482f1b244f4645aabd68df2952f2c36cea",
+      "f1ef3677b72461435611485c95408125cd9e160d",
+      "e237676c54d5e44c2c3b5038777e3d83fa906696",
+      "8a9408232904b898f63df0cf1711d18f6aa613e6",
+      "0d0d0fc870828a05026e2074e67ebdd11dda1e1b",
+      "b8efa7e7c43e9408b64f7e050a8ba3688189d45f",
+      "7b623f1c1688261f0cf1d2befca93ec0231d0a14",
+      "7496770c2e7168105c369dc781c758bc57fe6d28",
+      "05fc5746eeb6c0a0528debcc40b2225680deb44a",
+      "4423eacab47d6c18706caf6ad2e2597f173d9638",
+      "850c2597c4fb195f5ac1c937e19afa069f834220",
+      "f756f149b9ad0fb731a4431588c18d9974e95cd0",
+      "287ebb276c587d0d7cae2f7eea993f8a52e2b831",
+      "4718baf7ebd7e60c6a38f880814d78935e78ac60",
+      "daa355cc864e0fc33354ef41916af2f45aca0614",
+      "f8ebffea28f5fa63368081ec1071d409cedaa642",
+      "9e2c2b4b5117877d452b42f026ab5cdd728a2019",
+      "5831c9f2d5491b0f09c3e3b68746112689811294",
+      "c0421b85b775acac14425240436ecb5d355ed229",
+      "87fb91272fb2f54d60ff56b7e3572db2f71a038d",
+      "fe0f08309430a9178123a69e919012b488402ddf",
+      "5002ff197be8783380522a5e574ac18e82c5b7d3",
+      "f2f51b57265e3c233c979781b9f161e6a05d7a68",
+      "ebfe54a632a6d810d408bd4829cefeac7a6e72ea"
+    ],
+    "compact_signature": [
+      "6ca9edc5cb165323e7ccd9056a0070d4369bbde4",
+      "3df41fdfc6b634fd652bf479d0f9889bb78d93b0",
+      "94fb70be4c3bc27228a9c6b59dffeeecf2211cf2",
+      "b5b43eddb541f09554f5ad42e1514d8d54b79a04",
+      "9e80edd4d16abd73fe8eab3eceefa44748dbf27d",
+      "6555cdbaf98edf9c23621da0a60c1bfa29ae8832",
+      "87978314688359ffcfba7907af3ff9df5d32642e",
+      "1925a77713c5a0845c13bb310c60fd7b0fa66617",
+      "891a55536e04998f918c7392d320d572dd946b73",
+      "64a00350512395c0ae7c35b51c215d3e3eb37c97",
+      "be5109155da4ea68aea1a89807ab59ee5bb0a398",
+      "f258b0b4f384d888213a8adfca17e855a57f435b",
+      "a7c788345ea5664b3ac68a5812ab13fe5a7ce638",
+      "6f35c942138d553f95369b9516e784a5bcb0d31b",
+      "aef26d19f0fa405a57917110ea4342814660c82a",
+      "ecff18e118377ce2d1b2732eeeafb95f275a741f",
+      "68ab0605867d286c1b96706e18a2e9f47fc1f019",
+      "d64fe9ead3eb05f3ae7d8358eabac19192bb4555",
+      "e242e14943c845a946ae4451b0bb04564defd9bf",
+      "fefa1c69f37f60a0ca5eaba9a472ea6c780fd85b",
+      "fb4aab6308539dc65a63b6d7a9f97a95760d1f5f",
+      "798a6adb3cbca976321cb3581afe8d60eaadded2",
+      "fda3fabee0c5cd0b996db614693dcc0bbf9799e3",
+      "51ff164d38d01e75e9f6db672df0654a2674b1f0",
+      "02fe11a9648e84e88cfd595b0d4150b354aa1e6b",
+      "7cbe23d395cf8f8589bb480ba5194dfc2b97ea59",
+      "c440914670a662f494e28b72dd95afcd598ffc64",
+      "277ae981e0895788e100afe05796254dc969a665",
+      "c2628a3ac91b0bcab08871d327f91ba06c199b5a",
+      "97a6edfebfd53682bb1772ea2e1b2fe12d1e465b",
+      "50102838c3ff0880dd246fb58f0efc8089685722",
+      "5a09adf1b165b80b9f81a8beb4144d801e99c993",
+      "04aea0cd57aa249cfbd761bc7d13f3e8581c1ad9",
+      "ad266829fbd925fe1ce1c88e92777394456e0153",
+      "b7fdbd7df69e0cd42c4511341cb23589e41d304e",
+      "37d364a48d568d7ca82a2ea79c778a0d62c503da",
+      "b6d98ca02c6865d8b9faf3ea8a9c42b4f62efc28",
+      "5a16daea36abad79b0c8643485e9ff413d6d2342",
+      "275b351767728ec7c0a76db10b9ab612728af497",
+      "fe5c93521676a7c1f0de8b6e5ac8f807582643c5",
+      "ff74f5268e7b40705b73e8e615e157aa9994fbba",
+      "75c488bbd80d6348e4e23fc0b0505a300c1f3e30",
+      "7847c6f270f228009cd48650ec68556c2ffd32a1",
+      "f7f3a7482f1b244f4645aabd68df2952f2c36cea",
+      "f1ef3677b72461435611485c95408125cd9e160d",
+      "e237676c54d5e44c2c3b5038777e3d83fa906696",
+      "8a9408232904b898f63df0cf1711d18f6aa613e6",
+      "0d0d0fc870828a05026e2074e67ebdd11dda1e1b",
+      "b8efa7e7c43e9408b64f7e050a8ba3688189d45f",
+      "7b623f1c1688261f0cf1d2befca93ec0231d0a14",
+      "7496770c2e7168105c369dc781c758bc57fe6d28",
+      "05fc5746eeb6c0a0528debcc40b2225680deb44a",
+      "4423eacab47d6c18706caf6ad2e2597f173d9638",
+      "850c2597c4fb195f5ac1c937e19afa069f834220",
+      "f756f149b9ad0fb731a4431588c18d9974e95cd0",
+      "287ebb276c587d0d7cae2f7eea993f8a52e2b831",
+      "4718baf7ebd7e60c6a38f880814d78935e78ac60",
+      "daa355cc864e0fc33354ef41916af2f45aca0614",
+      "f8ebffea28f5fa63368081ec1071d409cedaa642",
+      "9e2c2b4b5117877d452b42f026ab5cdd728a2019",
+      "5831c9f2d5491b0f09c3e3b68746112689811294",
+      "c0421b85b775acac14425240436ecb5d355ed229",
+      "87fb91272fb2f54d60ff56b7e3572db2f71a038d",
+      "fe0f08309430a9178123a69e919012b488402ddf",
+      "5002ff197be8783380522a5e574ac18e82c5b7d3",
+      "f2f51b57265e3c233c979781b9f161e6a05d7a68",
+      "ebfe54a632a6d810d408bd4829cefeac7a6e72ea"
+    ]
+  },
+  {
+    "message": "00000000000000000000000000000000ffffffffffffffffffffffffffffffff",
+    "secretKey": "6981746f3f11aaead2e40ff8005b1854de781289",
+    "publicKey": [
+      "1e4841583c3e1fb4b85c9804962ea30ee5a51362",
+      "59b66214ad1f8b949e5e7190aabadbff7178bcca",
+      "914efcea114eec2942b020ea175b3bdb3d72cb92",
+      "8bb669604eefcf42bfe21af6483cd7c75704b9f9",
+      "919e18ed7882060b58e741ab9ef8c2265e875f28",
+      "65b63fc43017b57adeb3de029d42d31edfa8413d",
+      "6e373fbb91a4a9e05388eaecc84217fa7565162e",
+      "0dee0ccd9c90604a2f29921ce955db50e3be9cab",
+      "bb76bf15c0211c5d83dbcb2155af9d4c61d9e00c",
+      "d3f6009d45ac7b12238c9321b50743f8e6e5ab93",
+      "3415aa7c42d582efb2c5e871fdc55553897529c3",
+      "166cdc1c8d67f3e24ad77ac28ae96cd171544965",
+      "b6cb972b085e3ed0c37b70d3da62742624989231",
+      "f0a7c1a6ce81813f946a41983e55b2aa885cfe6d",
+      "a92744ab1a579348bf84f19e6e929b527db0145c",
+      "90dd08c339c590734d3b181ca997b1f64cf2f65f",
+      "b5353e9afbd95f81ba585a549522f24cceab180c",
+      "941aed57c1046320e34dc989efba6c9d0f142184",
+      "e12815577a48c080bae7aa0ae3dbcaa92e3aa106",
+      "ba4d185decb969ce58f900a86403aab1b2b60814",
+      "f9a8ea894440cd2e5d032114c7c65d80b3a554a2",
+      "77ac3f30d7387a999a62798df92959640f59e78b",
+      "05553f1d271cb27d103445f26f174f0a1e1718e3",
+      "dd440b3fa779c5cca33daca61ad893af45cf4adc",
+      "414f8221686d35f3b9e1fdafc47da9e66f9308ea",
+      "3a662974f7f1622f4dfa89d6be9da4116fe926dc",
+      "65a1759f8d05e8b36f919b957195d3ca495c0fbf",
+      "1bb68562175da4fc66b6fa3ec05e0e15ab326036",
+      "c5152d9b69b4065f9e0850dc80e15ba66cdb44e8",
+      "f8fe3c1b10761d007ca163f33b79db70e8c9dde4",
+      "cd9618c0aafc12425d3ed6756c36a18add1bc486",
+      "9a9eccca9c8880b325e05eb7f023124c7f6b31b6",
+      "309a4bd8257f5b37efff9f1d589b983e3d15c257",
+      "9cccd7ac6a522b4d2d9c6becef78d39cb8523e38",
+      "44dc67d8a1e26e0f0efddc2ff3607881f53c608f",
+      "6bfeae3e97f744bf8efbde074620f8ae3bf760b0",
+      "2ea55932288b4399c06e07540171c69376fd0746",
+      "607952fa280afec909477943b56c557dfea332b1",
+      "5da91bbe14c18c505220e78287d8f86ce4071ea3",
+      "21312ff0ce9c8ba6d7a775d00791f28b423a3d79",
+      "55fe05d51b33e251c7fdbdd2a42b71087281576f",
+      "fa6c3373664d73ae21649ba158328f40d7c91efd",
+      "81b1db3d8b27bd230d6d74dff7ef53c627670476",
+      "df0e1f60939c8ca6c592c82eb719ad973284fe4a",
+      "1173c30c3fe1a72f62c3b21314d4c3b606030d2e",
+      "bcf3c7c04d1c2cdfd33b8ffb7034a1dd9afc708f",
+      "d8175f46ba24830acaf7914222f5baaccae63843",
+      "7dd58a6812d2227a8ef5f05ddb76f13a995731f7",
+      "0aea37cb964eb5b23511d90133d589a97eb432c8",
+      "7b9a917cbb6950592380ce0800923266c78a2750",
+      "9d63ba151409cc8854ae4cf0881c3893b34700c6",
+      "fa25bfbca57d46dd4ce754d0965b612d9dbdb0e1",
+      "2229f9cfb8c5668a20f0fa7f40790785c5dc2e0c",
+      "f027c213740aa48f2e66d501f48d0d6f2bb023b6",
+      "7a77d0b1983b49674a00d2188f1104c7823f159b",
+      "e625480186b6da5f6249d1ae298a8e0b8c54340f",
+      "599bc5723972d0b2f5d7a78848c98c1edf4eb834",
+      "01978cc8d798e6314ec466c5861d257d02c96da3",
+      "a8f4f6d62a1518e0c46a4c49cb039dfd215ba25e",
+      "16aaa21a0e6248484133a1f0d8ca21a35739a86c",
+      "8d63fec89e4225e3168072a6f87ec03560aa7945",
+      "79445c1f4cd45a7119f3a76fd4d8c062deadd565",
+      "c1b7bab2b0e45d0a9d2843b9f4104cbe28c9647a",
+      "c374ed5ffb210c76647b8e7946af702405711258",
+      "e3629e90650a6616e2a22f6a1a8163006dec43d7",
+      "70b9dee17ff19edb1ed12d0179c645ee6f77004c",
+      "eb7e168156085af55d5ddf19970dd6bacd58f31f"
+    ],
+    "witness": [
+      "1e4841583c3e1fb4b85c9804962ea30ee5a51362",
+      "0f",
+      "59b66214ad1f8b949e5e7190aabadbff7178bcca",
+      "0f",
+      "914efcea114eec2942b020ea175b3bdb3d72cb92",
+      "0f",
+      "8bb669604eefcf42bfe21af6483cd7c75704b9f9",
+      "0f",
+      "919e18ed7882060b58e741ab9ef8c2265e875f28",
+      "0f",
+      "65b63fc43017b57adeb3de029d42d31edfa8413d",
+      "0f",
+      "6e373fbb91a4a9e05388eaecc84217fa7565162e",
+      "0f",
+      "0dee0ccd9c90604a2f29921ce955db50e3be9cab",
+      "0f",
+      "bb76bf15c0211c5d83dbcb2155af9d4c61d9e00c",
+      "0f",
+      "d3f6009d45ac7b12238c9321b50743f8e6e5ab93",
+      "0f",
+      "3415aa7c42d582efb2c5e871fdc55553897529c3",
+      "0f",
+      "166cdc1c8d67f3e24ad77ac28ae96cd171544965",
+      "0f",
+      "b6cb972b085e3ed0c37b70d3da62742624989231",
+      "0f",
+      "f0a7c1a6ce81813f946a41983e55b2aa885cfe6d",
+      "0f",
+      "a92744ab1a579348bf84f19e6e929b527db0145c",
+      "0f",
+      "90dd08c339c590734d3b181ca997b1f64cf2f65f",
+      "0f",
+      "b5353e9afbd95f81ba585a549522f24cceab180c",
+      "0f",
+      "941aed57c1046320e34dc989efba6c9d0f142184",
+      "0f",
+      "e12815577a48c080bae7aa0ae3dbcaa92e3aa106",
+      "0f",
+      "ba4d185decb969ce58f900a86403aab1b2b60814",
+      "0f",
+      "f9a8ea894440cd2e5d032114c7c65d80b3a554a2",
+      "0f",
+      "77ac3f30d7387a999a62798df92959640f59e78b",
+      "0f",
+      "05553f1d271cb27d103445f26f174f0a1e1718e3",
+      "0f",
+      "dd440b3fa779c5cca33daca61ad893af45cf4adc",
+      "0f",
+      "414f8221686d35f3b9e1fdafc47da9e66f9308ea",
+      "0f",
+      "3a662974f7f1622f4dfa89d6be9da4116fe926dc",
+      "0f",
+      "65a1759f8d05e8b36f919b957195d3ca495c0fbf",
+      "0f",
+      "1bb68562175da4fc66b6fa3ec05e0e15ab326036",
+      "0f",
+      "c5152d9b69b4065f9e0850dc80e15ba66cdb44e8",
+      "0f",
+      "f8fe3c1b10761d007ca163f33b79db70e8c9dde4",
+      "0f",
+      "cd9618c0aafc12425d3ed6756c36a18add1bc486",
+      "0f",
+      "9a9eccca9c8880b325e05eb7f023124c7f6b31b6",
+      "0f",
+      "c238429681c64733481c3814cdefe071043f4d03",
+      "",
+      "300f8591224a1d40a377bd7cf94b2ffb40d456b4",
+      "",
+      "cf45a02b484d5c884a56045ef9f819c45ac3100f",
+      "",
+      "9c41ee07835021e158295407ffd250622d2ff833",
+      "",
+      "3e44844af51163f59febea611310fb3778386ecd",
+      "",
+      "1bbb049ed88dab9a83c4a49687f67f56e3266283",
+      "",
+      "e09dc3fcb1f86e6ae2d9accdddee87eb8e77c745",
+      "",
+      "7a763c79753d6651c337a7c57bbde9c94a86eed5",
+      "",
+      "b5aad590f4d018685d6e5e54d18477195bfab4cc",
+      "",
+      "c840dba3dd27858510197ba9d2672a0060aa2674",
+      "",
+      "76d9c75aa685d019f633a015b75bcfc285b6eec0",
+      "",
+      "de0eb4e0292f00272f76e4e9b0bb3943652a8aae",
+      "",
+      "f1678cc527e065023c800fdf708d1919debd827c",
+      "",
+      "5d5bfa3d4210cd1e100638862e118b48d3f67324",
+      "",
+      "a7e582331667e396f0d987be7c6b9f5b8e07583e",
+      "",
+      "9878fb508c79e5ed0757ec95ae1ccd6e9792a1d4",
+      "",
+      "038f6163a28d461f58ccdebd453bdc9a24dacaf5",
+      "",
+      "e5674309d1d0ec8bd2fb21d4b88cd86b1fa2e909",
+      "",
+      "fc708cd8d2034745bb8743cc1088af0a842021b0",
+      "",
+      "6ce48e326cc4676c4f5d44283c96e63f3ba5c102",
+      "",
+      "58a9c61f69e2d599e9ff9d512de8a64bfce442b2",
+      "",
+      "d7f37a842e7946dcfb5b6a867d23a105e02f1321",
+      "",
+      "9a7ca58df168b0b211da40a32acbc547fe876ddd",
+      "",
+      "c864ab30006f1af5d921f6124fb6442008465cd3",
+      "",
+      "f4f23109b81e8142953a630bcd97b7d38b70ac32",
+      "",
+      "26e64ca2423883d9028a7db3c65dd4d3ba8cbdd8",
+      "",
+      "7475ddfbc0b34b076fb946a2fa692b5ca95431d4",
+      "",
+      "a852dc88d37a28cf0acb8f4be725d2db08dcc468",
+      "",
+      "485c5289e462bbb5d2e676ec7859eca7ae52a2c8",
+      "",
+      "d3dced839d2f8d0e1c1ba548f1040ce3cf9b0db3",
+      "",
+      "9cf035ae8828add8747570569390d125b23c879b",
+      "",
+      "57daf5261e23bc5c94edb7e0a0a1f428df31992e",
+      "",
+      "8f75590ea18e0a2df403098e0f52e6538120afea",
+      "01",
+      "09f3bb3d7130af1d29d622e7ec058b79861c6843",
+      "0e",
+      "397fddaf75cfbe934551ec1860314b09b59fbe78",
+      ""
+    ],
+    "signature": [
+      "1e4841583c3e1fb4b85c9804962ea30ee5a513620f",
+      "59b66214ad1f8b949e5e7190aabadbff7178bcca0f",
+      "914efcea114eec2942b020ea175b3bdb3d72cb920f",
+      "8bb669604eefcf42bfe21af6483cd7c75704b9f90f",
+      "919e18ed7882060b58e741ab9ef8c2265e875f280f",
+      "65b63fc43017b57adeb3de029d42d31edfa8413d0f",
+      "6e373fbb91a4a9e05388eaecc84217fa7565162e0f",
+      "0dee0ccd9c90604a2f29921ce955db50e3be9cab0f",
+      "bb76bf15c0211c5d83dbcb2155af9d4c61d9e00c0f",
+      "d3f6009d45ac7b12238c9321b50743f8e6e5ab930f",
+      "3415aa7c42d582efb2c5e871fdc55553897529c30f",
+      "166cdc1c8d67f3e24ad77ac28ae96cd1715449650f",
+      "b6cb972b085e3ed0c37b70d3da627426249892310f",
+      "f0a7c1a6ce81813f946a41983e55b2aa885cfe6d0f",
+      "a92744ab1a579348bf84f19e6e929b527db0145c0f",
+      "90dd08c339c590734d3b181ca997b1f64cf2f65f0f",
+      "b5353e9afbd95f81ba585a549522f24cceab180c0f",
+      "941aed57c1046320e34dc989efba6c9d0f1421840f",
+      "e12815577a48c080bae7aa0ae3dbcaa92e3aa1060f",
+      "ba4d185decb969ce58f900a86403aab1b2b608140f",
+      "f9a8ea894440cd2e5d032114c7c65d80b3a554a20f",
+      "77ac3f30d7387a999a62798df92959640f59e78b0f",
+      "05553f1d271cb27d103445f26f174f0a1e1718e30f",
+      "dd440b3fa779c5cca33daca61ad893af45cf4adc0f",
+      "414f8221686d35f3b9e1fdafc47da9e66f9308ea0f",
+      "3a662974f7f1622f4dfa89d6be9da4116fe926dc0f",
+      "65a1759f8d05e8b36f919b957195d3ca495c0fbf0f",
+      "1bb68562175da4fc66b6fa3ec05e0e15ab3260360f",
+      "c5152d9b69b4065f9e0850dc80e15ba66cdb44e80f",
+      "f8fe3c1b10761d007ca163f33b79db70e8c9dde40f",
+      "cd9618c0aafc12425d3ed6756c36a18add1bc4860f",
+      "9a9eccca9c8880b325e05eb7f023124c7f6b31b60f",
+      "c238429681c64733481c3814cdefe071043f4d0300",
+      "300f8591224a1d40a377bd7cf94b2ffb40d456b400",
+      "cf45a02b484d5c884a56045ef9f819c45ac3100f00",
+      "9c41ee07835021e158295407ffd250622d2ff83300",
+      "3e44844af51163f59febea611310fb3778386ecd00",
+      "1bbb049ed88dab9a83c4a49687f67f56e326628300",
+      "e09dc3fcb1f86e6ae2d9accdddee87eb8e77c74500",
+      "7a763c79753d6651c337a7c57bbde9c94a86eed500",
+      "b5aad590f4d018685d6e5e54d18477195bfab4cc00",
+      "c840dba3dd27858510197ba9d2672a0060aa267400",
+      "76d9c75aa685d019f633a015b75bcfc285b6eec000",
+      "de0eb4e0292f00272f76e4e9b0bb3943652a8aae00",
+      "f1678cc527e065023c800fdf708d1919debd827c00",
+      "5d5bfa3d4210cd1e100638862e118b48d3f6732400",
+      "a7e582331667e396f0d987be7c6b9f5b8e07583e00",
+      "9878fb508c79e5ed0757ec95ae1ccd6e9792a1d400",
+      "038f6163a28d461f58ccdebd453bdc9a24dacaf500",
+      "e5674309d1d0ec8bd2fb21d4b88cd86b1fa2e90900",
+      "fc708cd8d2034745bb8743cc1088af0a842021b000",
+      "6ce48e326cc4676c4f5d44283c96e63f3ba5c10200",
+      "58a9c61f69e2d599e9ff9d512de8a64bfce442b200",
+      "d7f37a842e7946dcfb5b6a867d23a105e02f132100",
+      "9a7ca58df168b0b211da40a32acbc547fe876ddd00",
+      "c864ab30006f1af5d921f6124fb6442008465cd300",
+      "f4f23109b81e8142953a630bcd97b7d38b70ac3200",
+      "26e64ca2423883d9028a7db3c65dd4d3ba8cbdd800",
+      "7475ddfbc0b34b076fb946a2fa692b5ca95431d400",
+      "a852dc88d37a28cf0acb8f4be725d2db08dcc46800",
+      "485c5289e462bbb5d2e676ec7859eca7ae52a2c800",
+      "d3dced839d2f8d0e1c1ba548f1040ce3cf9b0db300",
+      "9cf035ae8828add8747570569390d125b23c879b00",
+      "57daf5261e23bc5c94edb7e0a0a1f428df31992e00",
+      "8f75590ea18e0a2df403098e0f52e6538120afea01",
+      "09f3bb3d7130af1d29d622e7ec058b79861c68430e",
+      "397fddaf75cfbe934551ec1860314b09b59fbe7800"
+    ],
+    "compact_witness": [
+      "1e4841583c3e1fb4b85c9804962ea30ee5a51362",
+      "59b66214ad1f8b949e5e7190aabadbff7178bcca",
+      "914efcea114eec2942b020ea175b3bdb3d72cb92",
+      "8bb669604eefcf42bfe21af6483cd7c75704b9f9",
+      "919e18ed7882060b58e741ab9ef8c2265e875f28",
+      "65b63fc43017b57adeb3de029d42d31edfa8413d",
+      "6e373fbb91a4a9e05388eaecc84217fa7565162e",
+      "0dee0ccd9c90604a2f29921ce955db50e3be9cab",
+      "bb76bf15c0211c5d83dbcb2155af9d4c61d9e00c",
+      "d3f6009d45ac7b12238c9321b50743f8e6e5ab93",
+      "3415aa7c42d582efb2c5e871fdc55553897529c3",
+      "166cdc1c8d67f3e24ad77ac28ae96cd171544965",
+      "b6cb972b085e3ed0c37b70d3da62742624989231",
+      "f0a7c1a6ce81813f946a41983e55b2aa885cfe6d",
+      "a92744ab1a579348bf84f19e6e929b527db0145c",
+      "90dd08c339c590734d3b181ca997b1f64cf2f65f",
+      "b5353e9afbd95f81ba585a549522f24cceab180c",
+      "941aed57c1046320e34dc989efba6c9d0f142184",
+      "e12815577a48c080bae7aa0ae3dbcaa92e3aa106",
+      "ba4d185decb969ce58f900a86403aab1b2b60814",
+      "f9a8ea894440cd2e5d032114c7c65d80b3a554a2",
+      "77ac3f30d7387a999a62798df92959640f59e78b",
+      "05553f1d271cb27d103445f26f174f0a1e1718e3",
+      "dd440b3fa779c5cca33daca61ad893af45cf4adc",
+      "414f8221686d35f3b9e1fdafc47da9e66f9308ea",
+      "3a662974f7f1622f4dfa89d6be9da4116fe926dc",
+      "65a1759f8d05e8b36f919b957195d3ca495c0fbf",
+      "1bb68562175da4fc66b6fa3ec05e0e15ab326036",
+      "c5152d9b69b4065f9e0850dc80e15ba66cdb44e8",
+      "f8fe3c1b10761d007ca163f33b79db70e8c9dde4",
+      "cd9618c0aafc12425d3ed6756c36a18add1bc486",
+      "9a9eccca9c8880b325e05eb7f023124c7f6b31b6",
+      "c238429681c64733481c3814cdefe071043f4d03",
+      "300f8591224a1d40a377bd7cf94b2ffb40d456b4",
+      "cf45a02b484d5c884a56045ef9f819c45ac3100f",
+      "9c41ee07835021e158295407ffd250622d2ff833",
+      "3e44844af51163f59febea611310fb3778386ecd",
+      "1bbb049ed88dab9a83c4a49687f67f56e3266283",
+      "e09dc3fcb1f86e6ae2d9accdddee87eb8e77c745",
+      "7a763c79753d6651c337a7c57bbde9c94a86eed5",
+      "b5aad590f4d018685d6e5e54d18477195bfab4cc",
+      "c840dba3dd27858510197ba9d2672a0060aa2674",
+      "76d9c75aa685d019f633a015b75bcfc285b6eec0",
+      "de0eb4e0292f00272f76e4e9b0bb3943652a8aae",
+      "f1678cc527e065023c800fdf708d1919debd827c",
+      "5d5bfa3d4210cd1e100638862e118b48d3f67324",
+      "a7e582331667e396f0d987be7c6b9f5b8e07583e",
+      "9878fb508c79e5ed0757ec95ae1ccd6e9792a1d4",
+      "038f6163a28d461f58ccdebd453bdc9a24dacaf5",
+      "e5674309d1d0ec8bd2fb21d4b88cd86b1fa2e909",
+      "fc708cd8d2034745bb8743cc1088af0a842021b0",
+      "6ce48e326cc4676c4f5d44283c96e63f3ba5c102",
+      "58a9c61f69e2d599e9ff9d512de8a64bfce442b2",
+      "d7f37a842e7946dcfb5b6a867d23a105e02f1321",
+      "9a7ca58df168b0b211da40a32acbc547fe876ddd",
+      "c864ab30006f1af5d921f6124fb6442008465cd3",
+      "f4f23109b81e8142953a630bcd97b7d38b70ac32",
+      "26e64ca2423883d9028a7db3c65dd4d3ba8cbdd8",
+      "7475ddfbc0b34b076fb946a2fa692b5ca95431d4",
+      "a852dc88d37a28cf0acb8f4be725d2db08dcc468",
+      "485c5289e462bbb5d2e676ec7859eca7ae52a2c8",
+      "d3dced839d2f8d0e1c1ba548f1040ce3cf9b0db3",
+      "9cf035ae8828add8747570569390d125b23c879b",
+      "57daf5261e23bc5c94edb7e0a0a1f428df31992e",
+      "8f75590ea18e0a2df403098e0f52e6538120afea",
+      "09f3bb3d7130af1d29d622e7ec058b79861c6843",
+      "397fddaf75cfbe934551ec1860314b09b59fbe78"
+    ],
+    "compact_signature": [
+      "1e4841583c3e1fb4b85c9804962ea30ee5a51362",
+      "59b66214ad1f8b949e5e7190aabadbff7178bcca",
+      "914efcea114eec2942b020ea175b3bdb3d72cb92",
+      "8bb669604eefcf42bfe21af6483cd7c75704b9f9",
+      "919e18ed7882060b58e741ab9ef8c2265e875f28",
+      "65b63fc43017b57adeb3de029d42d31edfa8413d",
+      "6e373fbb91a4a9e05388eaecc84217fa7565162e",
+      "0dee0ccd9c90604a2f29921ce955db50e3be9cab",
+      "bb76bf15c0211c5d83dbcb2155af9d4c61d9e00c",
+      "d3f6009d45ac7b12238c9321b50743f8e6e5ab93",
+      "3415aa7c42d582efb2c5e871fdc55553897529c3",
+      "166cdc1c8d67f3e24ad77ac28ae96cd171544965",
+      "b6cb972b085e3ed0c37b70d3da62742624989231",
+      "f0a7c1a6ce81813f946a41983e55b2aa885cfe6d",
+      "a92744ab1a579348bf84f19e6e929b527db0145c",
+      "90dd08c339c590734d3b181ca997b1f64cf2f65f",
+      "b5353e9afbd95f81ba585a549522f24cceab180c",
+      "941aed57c1046320e34dc989efba6c9d0f142184",
+      "e12815577a48c080bae7aa0ae3dbcaa92e3aa106",
+      "ba4d185decb969ce58f900a86403aab1b2b60814",
+      "f9a8ea894440cd2e5d032114c7c65d80b3a554a2",
+      "77ac3f30d7387a999a62798df92959640f59e78b",
+      "05553f1d271cb27d103445f26f174f0a1e1718e3",
+      "dd440b3fa779c5cca33daca61ad893af45cf4adc",
+      "414f8221686d35f3b9e1fdafc47da9e66f9308ea",
+      "3a662974f7f1622f4dfa89d6be9da4116fe926dc",
+      "65a1759f8d05e8b36f919b957195d3ca495c0fbf",
+      "1bb68562175da4fc66b6fa3ec05e0e15ab326036",
+      "c5152d9b69b4065f9e0850dc80e15ba66cdb44e8",
+      "f8fe3c1b10761d007ca163f33b79db70e8c9dde4",
+      "cd9618c0aafc12425d3ed6756c36a18add1bc486",
+      "9a9eccca9c8880b325e05eb7f023124c7f6b31b6",
+      "c238429681c64733481c3814cdefe071043f4d03",
+      "300f8591224a1d40a377bd7cf94b2ffb40d456b4",
+      "cf45a02b484d5c884a56045ef9f819c45ac3100f",
+      "9c41ee07835021e158295407ffd250622d2ff833",
+      "3e44844af51163f59febea611310fb3778386ecd",
+      "1bbb049ed88dab9a83c4a49687f67f56e3266283",
+      "e09dc3fcb1f86e6ae2d9accdddee87eb8e77c745",
+      "7a763c79753d6651c337a7c57bbde9c94a86eed5",
+      "b5aad590f4d018685d6e5e54d18477195bfab4cc",
+      "c840dba3dd27858510197ba9d2672a0060aa2674",
+      "76d9c75aa685d019f633a015b75bcfc285b6eec0",
+      "de0eb4e0292f00272f76e4e9b0bb3943652a8aae",
+      "f1678cc527e065023c800fdf708d1919debd827c",
+      "5d5bfa3d4210cd1e100638862e118b48d3f67324",
+      "a7e582331667e396f0d987be7c6b9f5b8e07583e",
+      "9878fb508c79e5ed0757ec95ae1ccd6e9792a1d4",
+      "038f6163a28d461f58ccdebd453bdc9a24dacaf5",
+      "e5674309d1d0ec8bd2fb21d4b88cd86b1fa2e909",
+      "fc708cd8d2034745bb8743cc1088af0a842021b0",
+      "6ce48e326cc4676c4f5d44283c96e63f3ba5c102",
+      "58a9c61f69e2d599e9ff9d512de8a64bfce442b2",
+      "d7f37a842e7946dcfb5b6a867d23a105e02f1321",
+      "9a7ca58df168b0b211da40a32acbc547fe876ddd",
+      "c864ab30006f1af5d921f6124fb6442008465cd3",
+      "f4f23109b81e8142953a630bcd97b7d38b70ac32",
+      "26e64ca2423883d9028a7db3c65dd4d3ba8cbdd8",
+      "7475ddfbc0b34b076fb946a2fa692b5ca95431d4",
+      "a852dc88d37a28cf0acb8f4be725d2db08dcc468",
+      "485c5289e462bbb5d2e676ec7859eca7ae52a2c8",
+      "d3dced839d2f8d0e1c1ba548f1040ce3cf9b0db3",
+      "9cf035ae8828add8747570569390d125b23c879b",
+      "57daf5261e23bc5c94edb7e0a0a1f428df31992e",
+      "8f75590ea18e0a2df403098e0f52e6538120afea",
+      "09f3bb3d7130af1d29d622e7ec058b79861c6843",
+      "397fddaf75cfbe934551ec1860314b09b59fbe78"
+    ]
+  },
+  {
+    "message": "00000000000000000000ffffffffffffffffffff797b1cf9174167832f20aef8",
+    "secretKey": "66372bb079e3f96792a4ab81df784a67e59da023",
+    "publicKey": [
+      "8fa6e9fbadc13271258689585b5e7da480b5576b",
+      "6a2752fcc6e307ee2ef3e1781f9a1aa9db5a8813",
+      "70da180179006b5111970551361e73362013fc05",
+      "b852a79e8cf89bb7f72b21ad1ee3df6e0116df9a",
+      "8944c59c2522983bb83c9efea6aa1bd3582fe482",
+      "2d81e5e1f0aa712100f3c5e4e533cb445930d81f",
+      "47acf0d53de6c2099ca3bed61faaca496a6f88cb",
+      "751e477fc27da9f45efaa8b3f8c6e1d7a5846fad",
+      "d74eecc01b83f3d327f25d78141083a6e12bbf32",
+      "0fffd5dfa504b9587a60d99ee668400a4c71791e",
+      "eaf462a9eeb59838e5e093a2dc44c34a3f1d2a50",
+      "a19d10322c7e8874af7f608224ca51522ef9df68",
+      "6afa419aae59c424efba56043409012d1d887891",
+      "dd7914b7d6a076bc4023838526c2129e4e6fd1e9",
+      "554410a131a35fa8f043ec6f65b574d5b07ff970",
+      "9e644914b7ae36f0ed70d6a2bc1b37305cb79585",
+      "d56d8a9d70a0da75d3244da138af75bd04262578",
+      "767ed81261cfa79a738a812c5c0ea3e7b4469a0c",
+      "d375c1eb5e2575ef9cb907f97dbe612c43848e5f",
+      "d41d8ba7f65d18e7b0bd1836015c839257d61a32",
+      "ffc6981ada89b97299493db4466f4778e4213d30",
+      "84742585ceccf9efcc71351164b5b577ce03c4d4",
+      "82ad97d1c0525112d48a616f4e2ff2f6a47b9fee",
+      "fb1ed2a4521e137a4c98d270571873cac04c3042",
+      "249302c669f654c14c9c4b6ae4ed6e633628dd0d",
+      "f9cb1dcca46b509954ed49bb0e3c7a57f2a02257",
+      "848ddcfd9f1993e9944b2b6f2132db5afc54afb3",
+      "cc406d03b385dbfb29de51817d10bf2e216c7b9b",
+      "b36102e011e7cda11f805b846eb4bf7cd5576ec0",
+      "a4b2e3ace2b02460736455b2395a1379c14d0988",
+      "f8d5a7cdac779192f388874ab84edbbfe268cdd2",
+      "b90857b6b59231f67dd2dee903d9139c632e64e9",
+      "aa7d91e74efe8d7fee31890a2f3b13c095ac8e88",
+      "41a7410e483503cd751c824e7fb1153007f718e9",
+      "3282b244b84373abd276026695e66f95b71d3feb",
+      "b7c4ed95db52ddf94206ada6969e2045950710c3",
+      "a2441b24d2195ca097644d6df3b94210598e9b16",
+      "ae6d716cea1ac22e28c1bd490a0e59caf1ceb200",
+      "e224bc06fc1aa689872bc66ba3fd4db8cb319208",
+      "19919cc46196603264e70983b9e1271b356e7867",
+      "042cfe14a1ae7a2ebdaa7d2f53171ad7dff68ae9",
+      "5cb6683e9d2f7e0ba234fcc99e1376187a87e99d",
+      "435843df98fd5b4cbbc1f1adbab6110f53f28d4b",
+      "69aa5412f80756fd26081027b705ab8c4215ac76",
+      "70f2be453b51a05800ada704e83874fe4fcee232",
+      "a32e8f334081af3c657712b98f49b6f8b50cd552",
+      "9ad18498df3a70075d20c7b93cf849ce219431dd",
+      "31e2ce1b74898325ea708a10346cec41f3635aff",
+      "4e54523046950778dbd5658277709a1a163f7c12",
+      "c9cb2cca746d6abefa52d8088a75c6d8c558537b",
+      "e4c934b0c480e2c02c1f718387a6fdd94fb33738",
+      "8ee572bf79127c8c27a180dc30ffb0ab01b2752f",
+      "e8ae25310513e9716fc3613ed44f8dd0bfa74522",
+      "471cb5c43f7b7fc3b439172067c74acec880277d",
+      "cf52d486e95d3871a53b5abb08b943bc23d33116",
+      "d2b28d3731a84416ac31553cf0b28176209cdab1",
+      "2336f7cd91da52ece88814a76509cac1c4191c85",
+      "4bc256a4f19761108d74bbef2e578b05416932ae",
+      "a92820831370a2d355755eed1654675dec33c7fd",
+      "ca14db6b9e4d59ee600f1cd9b8469a5591648545",
+      "5a4bd6c856a44e523d5f705fac6850090a236ab5",
+      "6ff197c1d48d19c48bbff426bed33a087cf6f29b",
+      "a4ebb4735ebb24ef6c0e81c0144775ee666e4144",
+      "320cb81de0b8887200d8405fab80d6eea16a8bad",
+      "75791b1061c61bd9ae96dfe82d17f8c4a8e592e3",
+      "d24290ba221474ee5a0a5911e60c7f350e244f89",
+      "0a299287ea0081b7bbc24689b787164a153927a8"
+    ],
+    "witness": [
+      "8fa6e9fbadc13271258689585b5e7da480b5576b",
+      "0f",
+      "012d16c80acdd5f6c099be50a59548fc62f7072b",
+      "08",
+      "aacb2c4b496b2a66f826db1df49d0e8d10ef33fa",
+      "0a",
+      "7f5d6e0e6732f3d0dbcdd73ff3983d490c4a9be6",
+      "0e",
+      "1423f1832b812e56ac64f6dc05b4fb960c393951",
+      "02",
+      "4a81dcfae36994c84c43d6861a38918b684cb27c",
+      "",
+      "38f185b3a812aeb5e698af2aed99d7f6df079198",
+      "02",
+      "751e477fc27da9f45efaa8b3f8c6e1d7a5846fad",
+      "0f",
+      "71c2d1819e375632581ba2d95802642288211c16",
+      "08",
+      "c9aba01c06d0781b7caa6ef9a0c9fb80b57ac041",
+      "03",
+      "981b3e46887f0fe0032e9ac31560431c4b9b63b5",
+      "06",
+      "2be012c1eeb02ec7f702d19f7edf4f1be87b6733",
+      "07",
+      "8bc129967e3447d9d8549861cf66b20b044cec94",
+      "04",
+      "2895e78d980bef233a0509d79433085a795dc942",
+      "01",
+      "88d66a022cbc57b0123f75a90352985f4e8cd8a4",
+      "01",
+      "5acf776f3282f1b1135476fb0346ee13ae301025",
+      "07",
+      "d56d8a9d70a0da75d3244da138af75bd04262578",
+      "0f",
+      "f3d4d8193977a3fd3a614a91665ad77d3ff64335",
+      "09",
+      "32465f1341641289b1986fb8d8bc1be4df572227",
+      "01",
+      "7e074232afbe8dcabfa7df26ab0abfebb0633a2b",
+      "0c",
+      "6501e9bf85eef2d2f8f184faceaa5a02ca380336",
+      "07",
+      "9347bc11d0bb277830ec66d420aeccf5ca3413d6",
+      "0b",
+      "1d63aedbf94278394366b3f8bdd577f58cd6b1fe",
+      "07",
+      "6f8ea35638cc3f64f611cacffc0f820f033fd130",
+      "09",
+      "249302c669f654c14c9c4b6ae4ed6e633628dd0d",
+      "0f",
+      "f9cb1dcca46b509954ed49bb0e3c7a57f2a02257",
+      "0f",
+      "848ddcfd9f1993e9944b2b6f2132db5afc54afb3",
+      "0f",
+      "cc406d03b385dbfb29de51817d10bf2e216c7b9b",
+      "0f",
+      "b36102e011e7cda11f805b846eb4bf7cd5576ec0",
+      "0f",
+      "a4b2e3ace2b02460736455b2395a1379c14d0988",
+      "0f",
+      "f8d5a7cdac779192f388874ab84edbbfe268cdd2",
+      "0f",
+      "b90857b6b59231f67dd2dee903d9139c632e64e9",
+      "0f",
+      "aa7d91e74efe8d7fee31890a2f3b13c095ac8e88",
+      "0f",
+      "41a7410e483503cd751c824e7fb1153007f718e9",
+      "0f",
+      "3282b244b84373abd276026695e66f95b71d3feb",
+      "0f",
+      "b7c4ed95db52ddf94206ada6969e2045950710c3",
+      "0f",
+      "a2441b24d2195ca097644d6df3b94210598e9b16",
+      "0f",
+      "ae6d716cea1ac22e28c1bd490a0e59caf1ceb200",
+      "0f",
+      "e224bc06fc1aa689872bc66ba3fd4db8cb319208",
+      "0f",
+      "19919cc46196603264e70983b9e1271b356e7867",
+      "0f",
+      "042cfe14a1ae7a2ebdaa7d2f53171ad7dff68ae9",
+      "0f",
+      "5cb6683e9d2f7e0ba234fcc99e1376187a87e99d",
+      "0f",
+      "435843df98fd5b4cbbc1f1adbab6110f53f28d4b",
+      "0f",
+      "69aa5412f80756fd26081027b705ab8c4215ac76",
+      "0f",
+      "b3ae4758addde3a884094bfc434b06b7c3d7cfa3",
+      "",
+      "38301eab5e9906dda0b6f05da28c67a9a9ae17af",
+      "",
+      "2fbc62e47f3b91e495acd1dfdd1dfc7c6479fde3",
+      "",
+      "30d39017cb922a4b5cd15da1848b873a67e4c1d4",
+      "",
+      "f812fce053dea0198edc0456b425b995cc9da97b",
+      "",
+      "174b8b75468b9f6cc5b980488836a6f30198e1b9",
+      "",
+      "ff5f4fade26b6bce983077c563d82c2abceee539",
+      "",
+      "e63e3e96b4faade01990b2d248e110464de9aded",
+      "",
+      "691da6ef5da75b481584cbe7789f622390228452",
+      "",
+      "4086c7c8a9a0f5b16d5b389b697f64a6d7cc922e",
+      "",
+      "2f0ab86032f3c658b5bbd5bc4932fcb5290dc6d1",
+      "",
+      "4e89274eaea1d62875753a556e23b4713987fded",
+      "",
+      "13ceb414b78863f1c97c98faafc87e820f093da1",
+      "",
+      "cf3fb2a0db827f1bcd2a70c593756acd8442877e",
+      "",
+      "db80cfc634f371f8571193e09a4cd94f1aba54db",
+      "",
+      "541175e8064990ce94b87c498da230d93dcf1f93",
+      "",
+      "25027ae2a5ed112f43087feb2fd0b664acd4181a",
+      "",
+      "42607d0953e4cdde98b75bc7ad214c2323eed69f",
+      "",
+      "6084d4d1c60d2d8bd2fcd3d2ba2372908a9c76bd",
+      "",
+      "527b2468f9d09525c6029ad63b88f50c5eab7405",
+      "",
+      "50b06c3d97e5f3607b6173a632d42d6946d8ae17",
+      "01",
+      "a1cda5d0035ec43ac2a542d8a36a10212b6ede98",
+      "0e",
+      "c0a783f3b384d34628f12a6f46cc267368c98a42",
+      "06"
+    ],
+    "signature": [
+      "8fa6e9fbadc13271258689585b5e7da480b5576b0f",
+      "012d16c80acdd5f6c099be50a59548fc62f7072b08",
+      "aacb2c4b496b2a66f826db1df49d0e8d10ef33fa0a",
+      "7f5d6e0e6732f3d0dbcdd73ff3983d490c4a9be60e",
+      "1423f1832b812e56ac64f6dc05b4fb960c39395102",
+      "4a81dcfae36994c84c43d6861a38918b684cb27c00",
+      "38f185b3a812aeb5e698af2aed99d7f6df07919802",
+      "751e477fc27da9f45efaa8b3f8c6e1d7a5846fad0f",
+      "71c2d1819e375632581ba2d95802642288211c1608",
+      "c9aba01c06d0781b7caa6ef9a0c9fb80b57ac04103",
+      "981b3e46887f0fe0032e9ac31560431c4b9b63b506",
+      "2be012c1eeb02ec7f702d19f7edf4f1be87b673307",
+      "8bc129967e3447d9d8549861cf66b20b044cec9404",
+      "2895e78d980bef233a0509d79433085a795dc94201",
+      "88d66a022cbc57b0123f75a90352985f4e8cd8a401",
+      "5acf776f3282f1b1135476fb0346ee13ae30102507",
+      "d56d8a9d70a0da75d3244da138af75bd042625780f",
+      "f3d4d8193977a3fd3a614a91665ad77d3ff6433509",
+      "32465f1341641289b1986fb8d8bc1be4df57222701",
+      "7e074232afbe8dcabfa7df26ab0abfebb0633a2b0c",
+      "6501e9bf85eef2d2f8f184faceaa5a02ca38033607",
+      "9347bc11d0bb277830ec66d420aeccf5ca3413d60b",
+      "1d63aedbf94278394366b3f8bdd577f58cd6b1fe07",
+      "6f8ea35638cc3f64f611cacffc0f820f033fd13009",
+      "249302c669f654c14c9c4b6ae4ed6e633628dd0d0f",
+      "f9cb1dcca46b509954ed49bb0e3c7a57f2a022570f",
+      "848ddcfd9f1993e9944b2b6f2132db5afc54afb30f",
+      "cc406d03b385dbfb29de51817d10bf2e216c7b9b0f",
+      "b36102e011e7cda11f805b846eb4bf7cd5576ec00f",
+      "a4b2e3ace2b02460736455b2395a1379c14d09880f",
+      "f8d5a7cdac779192f388874ab84edbbfe268cdd20f",
+      "b90857b6b59231f67dd2dee903d9139c632e64e90f",
+      "aa7d91e74efe8d7fee31890a2f3b13c095ac8e880f",
+      "41a7410e483503cd751c824e7fb1153007f718e90f",
+      "3282b244b84373abd276026695e66f95b71d3feb0f",
+      "b7c4ed95db52ddf94206ada6969e2045950710c30f",
+      "a2441b24d2195ca097644d6df3b94210598e9b160f",
+      "ae6d716cea1ac22e28c1bd490a0e59caf1ceb2000f",
+      "e224bc06fc1aa689872bc66ba3fd4db8cb3192080f",
+      "19919cc46196603264e70983b9e1271b356e78670f",
+      "042cfe14a1ae7a2ebdaa7d2f53171ad7dff68ae90f",
+      "5cb6683e9d2f7e0ba234fcc99e1376187a87e99d0f",
+      "435843df98fd5b4cbbc1f1adbab6110f53f28d4b0f",
+      "69aa5412f80756fd26081027b705ab8c4215ac760f",
+      "b3ae4758addde3a884094bfc434b06b7c3d7cfa300",
+      "38301eab5e9906dda0b6f05da28c67a9a9ae17af00",
+      "2fbc62e47f3b91e495acd1dfdd1dfc7c6479fde300",
+      "30d39017cb922a4b5cd15da1848b873a67e4c1d400",
+      "f812fce053dea0198edc0456b425b995cc9da97b00",
+      "174b8b75468b9f6cc5b980488836a6f30198e1b900",
+      "ff5f4fade26b6bce983077c563d82c2abceee53900",
+      "e63e3e96b4faade01990b2d248e110464de9aded00",
+      "691da6ef5da75b481584cbe7789f62239022845200",
+      "4086c7c8a9a0f5b16d5b389b697f64a6d7cc922e00",
+      "2f0ab86032f3c658b5bbd5bc4932fcb5290dc6d100",
+      "4e89274eaea1d62875753a556e23b4713987fded00",
+      "13ceb414b78863f1c97c98faafc87e820f093da100",
+      "cf3fb2a0db827f1bcd2a70c593756acd8442877e00",
+      "db80cfc634f371f8571193e09a4cd94f1aba54db00",
+      "541175e8064990ce94b87c498da230d93dcf1f9300",
+      "25027ae2a5ed112f43087feb2fd0b664acd4181a00",
+      "42607d0953e4cdde98b75bc7ad214c2323eed69f00",
+      "6084d4d1c60d2d8bd2fcd3d2ba2372908a9c76bd00",
+      "527b2468f9d09525c6029ad63b88f50c5eab740500",
+      "50b06c3d97e5f3607b6173a632d42d6946d8ae1701",
+      "a1cda5d0035ec43ac2a542d8a36a10212b6ede980e",
+      "c0a783f3b384d34628f12a6f46cc267368c98a4206"
+    ],
+    "compact_witness": [
+      "8fa6e9fbadc13271258689585b5e7da480b5576b",
+      "012d16c80acdd5f6c099be50a59548fc62f7072b",
+      "aacb2c4b496b2a66f826db1df49d0e8d10ef33fa",
+      "7f5d6e0e6732f3d0dbcdd73ff3983d490c4a9be6",
+      "1423f1832b812e56ac64f6dc05b4fb960c393951",
+      "4a81dcfae36994c84c43d6861a38918b684cb27c",
+      "38f185b3a812aeb5e698af2aed99d7f6df079198",
+      "751e477fc27da9f45efaa8b3f8c6e1d7a5846fad",
+      "71c2d1819e375632581ba2d95802642288211c16",
+      "c9aba01c06d0781b7caa6ef9a0c9fb80b57ac041",
+      "981b3e46887f0fe0032e9ac31560431c4b9b63b5",
+      "2be012c1eeb02ec7f702d19f7edf4f1be87b6733",
+      "8bc129967e3447d9d8549861cf66b20b044cec94",
+      "2895e78d980bef233a0509d79433085a795dc942",
+      "88d66a022cbc57b0123f75a90352985f4e8cd8a4",
+      "5acf776f3282f1b1135476fb0346ee13ae301025",
+      "d56d8a9d70a0da75d3244da138af75bd04262578",
+      "f3d4d8193977a3fd3a614a91665ad77d3ff64335",
+      "32465f1341641289b1986fb8d8bc1be4df572227",
+      "7e074232afbe8dcabfa7df26ab0abfebb0633a2b",
+      "6501e9bf85eef2d2f8f184faceaa5a02ca380336",
+      "9347bc11d0bb277830ec66d420aeccf5ca3413d6",
+      "1d63aedbf94278394366b3f8bdd577f58cd6b1fe",
+      "6f8ea35638cc3f64f611cacffc0f820f033fd130",
+      "249302c669f654c14c9c4b6ae4ed6e633628dd0d",
+      "f9cb1dcca46b509954ed49bb0e3c7a57f2a02257",
+      "848ddcfd9f1993e9944b2b6f2132db5afc54afb3",
+      "cc406d03b385dbfb29de51817d10bf2e216c7b9b",
+      "b36102e011e7cda11f805b846eb4bf7cd5576ec0",
+      "a4b2e3ace2b02460736455b2395a1379c14d0988",
+      "f8d5a7cdac779192f388874ab84edbbfe268cdd2",
+      "b90857b6b59231f67dd2dee903d9139c632e64e9",
+      "aa7d91e74efe8d7fee31890a2f3b13c095ac8e88",
+      "41a7410e483503cd751c824e7fb1153007f718e9",
+      "3282b244b84373abd276026695e66f95b71d3feb",
+      "b7c4ed95db52ddf94206ada6969e2045950710c3",
+      "a2441b24d2195ca097644d6df3b94210598e9b16",
+      "ae6d716cea1ac22e28c1bd490a0e59caf1ceb200",
+      "e224bc06fc1aa689872bc66ba3fd4db8cb319208",
+      "19919cc46196603264e70983b9e1271b356e7867",
+      "042cfe14a1ae7a2ebdaa7d2f53171ad7dff68ae9",
+      "5cb6683e9d2f7e0ba234fcc99e1376187a87e99d",
+      "435843df98fd5b4cbbc1f1adbab6110f53f28d4b",
+      "69aa5412f80756fd26081027b705ab8c4215ac76",
+      "b3ae4758addde3a884094bfc434b06b7c3d7cfa3",
+      "38301eab5e9906dda0b6f05da28c67a9a9ae17af",
+      "2fbc62e47f3b91e495acd1dfdd1dfc7c6479fde3",
+      "30d39017cb922a4b5cd15da1848b873a67e4c1d4",
+      "f812fce053dea0198edc0456b425b995cc9da97b",
+      "174b8b75468b9f6cc5b980488836a6f30198e1b9",
+      "ff5f4fade26b6bce983077c563d82c2abceee539",
+      "e63e3e96b4faade01990b2d248e110464de9aded",
+      "691da6ef5da75b481584cbe7789f622390228452",
+      "4086c7c8a9a0f5b16d5b389b697f64a6d7cc922e",
+      "2f0ab86032f3c658b5bbd5bc4932fcb5290dc6d1",
+      "4e89274eaea1d62875753a556e23b4713987fded",
+      "13ceb414b78863f1c97c98faafc87e820f093da1",
+      "cf3fb2a0db827f1bcd2a70c593756acd8442877e",
+      "db80cfc634f371f8571193e09a4cd94f1aba54db",
+      "541175e8064990ce94b87c498da230d93dcf1f93",
+      "25027ae2a5ed112f43087feb2fd0b664acd4181a",
+      "42607d0953e4cdde98b75bc7ad214c2323eed69f",
+      "6084d4d1c60d2d8bd2fcd3d2ba2372908a9c76bd",
+      "527b2468f9d09525c6029ad63b88f50c5eab7405",
+      "50b06c3d97e5f3607b6173a632d42d6946d8ae17",
+      "a1cda5d0035ec43ac2a542d8a36a10212b6ede98",
+      "c0a783f3b384d34628f12a6f46cc267368c98a42"
+    ],
+    "compact_signature": [
+      "8fa6e9fbadc13271258689585b5e7da480b5576b",
+      "012d16c80acdd5f6c099be50a59548fc62f7072b",
+      "aacb2c4b496b2a66f826db1df49d0e8d10ef33fa",
+      "7f5d6e0e6732f3d0dbcdd73ff3983d490c4a9be6",
+      "1423f1832b812e56ac64f6dc05b4fb960c393951",
+      "4a81dcfae36994c84c43d6861a38918b684cb27c",
+      "38f185b3a812aeb5e698af2aed99d7f6df079198",
+      "751e477fc27da9f45efaa8b3f8c6e1d7a5846fad",
+      "71c2d1819e375632581ba2d95802642288211c16",
+      "c9aba01c06d0781b7caa6ef9a0c9fb80b57ac041",
+      "981b3e46887f0fe0032e9ac31560431c4b9b63b5",
+      "2be012c1eeb02ec7f702d19f7edf4f1be87b6733",
+      "8bc129967e3447d9d8549861cf66b20b044cec94",
+      "2895e78d980bef233a0509d79433085a795dc942",
+      "88d66a022cbc57b0123f75a90352985f4e8cd8a4",
+      "5acf776f3282f1b1135476fb0346ee13ae301025",
+      "d56d8a9d70a0da75d3244da138af75bd04262578",
+      "f3d4d8193977a3fd3a614a91665ad77d3ff64335",
+      "32465f1341641289b1986fb8d8bc1be4df572227",
+      "7e074232afbe8dcabfa7df26ab0abfebb0633a2b",
+      "6501e9bf85eef2d2f8f184faceaa5a02ca380336",
+      "9347bc11d0bb277830ec66d420aeccf5ca3413d6",
+      "1d63aedbf94278394366b3f8bdd577f58cd6b1fe",
+      "6f8ea35638cc3f64f611cacffc0f820f033fd130",
+      "249302c669f654c14c9c4b6ae4ed6e633628dd0d",
+      "f9cb1dcca46b509954ed49bb0e3c7a57f2a02257",
+      "848ddcfd9f1993e9944b2b6f2132db5afc54afb3",
+      "cc406d03b385dbfb29de51817d10bf2e216c7b9b",
+      "b36102e011e7cda11f805b846eb4bf7cd5576ec0",
+      "a4b2e3ace2b02460736455b2395a1379c14d0988",
+      "f8d5a7cdac779192f388874ab84edbbfe268cdd2",
+      "b90857b6b59231f67dd2dee903d9139c632e64e9",
+      "aa7d91e74efe8d7fee31890a2f3b13c095ac8e88",
+      "41a7410e483503cd751c824e7fb1153007f718e9",
+      "3282b244b84373abd276026695e66f95b71d3feb",
+      "b7c4ed95db52ddf94206ada6969e2045950710c3",
+      "a2441b24d2195ca097644d6df3b94210598e9b16",
+      "ae6d716cea1ac22e28c1bd490a0e59caf1ceb200",
+      "e224bc06fc1aa689872bc66ba3fd4db8cb319208",
+      "19919cc46196603264e70983b9e1271b356e7867",
+      "042cfe14a1ae7a2ebdaa7d2f53171ad7dff68ae9",
+      "5cb6683e9d2f7e0ba234fcc99e1376187a87e99d",
+      "435843df98fd5b4cbbc1f1adbab6110f53f28d4b",
+      "69aa5412f80756fd26081027b705ab8c4215ac76",
+      "b3ae4758addde3a884094bfc434b06b7c3d7cfa3",
+      "38301eab5e9906dda0b6f05da28c67a9a9ae17af",
+      "2fbc62e47f3b91e495acd1dfdd1dfc7c6479fde3",
+      "30d39017cb922a4b5cd15da1848b873a67e4c1d4",
+      "f812fce053dea0198edc0456b425b995cc9da97b",
+      "174b8b75468b9f6cc5b980488836a6f30198e1b9",
+      "ff5f4fade26b6bce983077c563d82c2abceee539",
+      "e63e3e96b4faade01990b2d248e110464de9aded",
+      "691da6ef5da75b481584cbe7789f622390228452",
+      "4086c7c8a9a0f5b16d5b389b697f64a6d7cc922e",
+      "2f0ab86032f3c658b5bbd5bc4932fcb5290dc6d1",
+      "4e89274eaea1d62875753a556e23b4713987fded",
+      "13ceb414b78863f1c97c98faafc87e820f093da1",
+      "cf3fb2a0db827f1bcd2a70c593756acd8442877e",
+      "db80cfc634f371f8571193e09a4cd94f1aba54db",
+      "541175e8064990ce94b87c498da230d93dcf1f93",
+      "25027ae2a5ed112f43087feb2fd0b664acd4181a",
+      "42607d0953e4cdde98b75bc7ad214c2323eed69f",
+      "6084d4d1c60d2d8bd2fcd3d2ba2372908a9c76bd",
+      "527b2468f9d09525c6029ad63b88f50c5eab7405",
+      "50b06c3d97e5f3607b6173a632d42d6946d8ae17",
+      "a1cda5d0035ec43ac2a542d8a36a10212b6ede98",
+      "c0a783f3b384d34628f12a6f46cc267368c98a42"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/bridge/Cargo.toml b/bridge/Cargo.toml
new file mode 100644
index 000000000..e7523017a
--- /dev/null
+++ b/bridge/Cargo.toml
@@ -0,0 +1,65 @@
+[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
+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
+derive_more.workspace = true
+zstd = "0.13.2"
+bitcode = "0.6.3"
+human_bytes = { version = "0.4", features = ["fast"] }
+lru = "0.13.0"
+
+[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/src/bin/cli_query/main.rs b/bridge/src/bin/bridge-query/main.rs
similarity index 89%
rename from src/bin/cli_query/main.rs
rename to bridge/src/bin/bridge-query/main.rs
index 0ade3837c..e5b991989 100644
--- a/src/bin/cli_query/main.rs
+++ b/bridge/src/bin/bridge-query/main.rs
@@ -1,5 +1,5 @@
 use bitcoin::Network;
-use bitvm::bridge::{client::cli::query_command::QueryCommand, constants::DestinationNetwork};
+use bridge::{client::cli::query_command::QueryCommand, constants::DestinationNetwork};
 use clap::{arg, command};
 use std::error::Error;
 
@@ -16,8 +16,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .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)").required(false)
-        .default_value("mainnet"))
+        .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();
@@ -25,6 +25,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         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);
diff --git a/src/bin/cli/main.rs b/bridge/src/bin/bridge/main.rs
similarity index 53%
rename from src/bin/cli/main.rs
rename to bridge/src/bin/bridge/main.rs
index 44adbec2c..6ff43ebe2 100644
--- a/src/bin/cli/main.rs
+++ b/bridge/src/bin/bridge/main.rs
@@ -1,11 +1,14 @@
 use bitcoin::PublicKey;
-use bitvm::bridge::client::cli::client_command::{ClientCommand, CommonArgs};
-use bitvm::bridge::client::cli::key_command::KeysCommand;
+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)
@@ -14,18 +17,26 @@ async fn main() -> Result<(), Box<dyn Error>> {
             arg!(--"key-dir" <DIRECTORY> "The directory containing the private keys").required(false).env("KEY_DIR"),
         )
         .arg(
-            arg!(-r --verifiers [VERIFIER_PUBKEYS] "Pubkeys of the verifiers")
+            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). Defaults to mainnet.").required(false).default_value("mainnet").env("ENVIRONMENT"))
+        .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_funding_amounts_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())
@@ -39,16 +50,26 @@ async fn main() -> Result<(), Box<dyn Error>> {
             .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-funding-amounts").is_some() {
+        let client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_get_funding_amounts().await;
+    } else if matches.subcommand_matches("get-operator-address").is_some() {
+        let 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 = 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;
@@ -58,6 +79,24 @@ async fn main() -> Result<(), Box<dyn Error>> {
         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;
diff --git a/bridge/src/client/chain/chain.rs b/bridge/src/client/chain/chain.rs
new file mode 100644
index 000000000..50f0d8a7f
--- /dev/null
+++ b/bridge/src/client/chain/chain.rs
@@ -0,0 +1,67 @@
+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 61%
rename from src/bridge/client/chain/ethereum.rs
rename to bridge/src/client/chain/ethereum_adaptor.rs
index 0da14ab80..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,
@@ -76,15 +78,15 @@ impl EthereumAdaptor {
         };
 
         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());
         }
@@ -104,28 +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.as_ref()).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.as_ref())
+                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(),
-                    tx_hash: e.transaction_hash.unwrap().to_vec(),
+                            operator_public_key,
+                            timestamp: u32::try_from(e.block_timestamp.unwrap()).unwrap(),
+                            tx_hash: e.transaction_hash.unwrap().to_vec(),
+                        })
+                    }
+                    None => None,
                 }
             })
             .collect();
@@ -148,8 +161,7 @@ impl ChainAdaptor for EthereumAdaptor {
                 PegOutBurntEvent {
                     withdrawer_chain_address: e.inner.data.withdrawer.to_string(),
                     source_outpoint: OutPoint {
-                        txid: Txid::from_slice(e.inner.data.source_outpoint.txId.as_ref())
-                            .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(
@@ -159,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();
@@ -192,38 +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");
-        let to_block = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_TO_BLOCK");
-        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(),
-            to_block: match to_block {
-                Ok(block) => Some(BlockNumberOrTag::from_str(block.as_str()).unwrap()),
-                Err(_) => Some(BlockNumberOrTag::Finalized),
-            },
-        }))
     }
 
-    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),
-            to_block: conf.to_block,
+            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..7df85fadb
--- /dev/null
+++ b/bridge/src/client/chain/mock_adaptor.rs
@@ -0,0 +1,54 @@
+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..2b200bb64
--- /dev/null
+++ b/bridge/src/client/cli/client_command.rs
@@ -0,0 +1,622 @@
+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::graphs::base::{PEG_IN_FEE, PEG_OUT_FEE};
+use crate::proof::{get_proof, invalidate_proof};
+use crate::transactions::base::{Input, MIN_RELAY_FEE_PEG_OUT};
+use ark_serialize::CanonicalDeserialize;
+
+use bitcoin::hex::FromHex;
+use bitcoin::{Address, Network, OutPoint, PublicKey};
+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 = Vec::<u8>::from_hex(&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,
+        }
+    }
+
+    async fn get_funding_utxo_input(&self, utxo_arg: Option<&String>) -> io::Result<Input> {
+        let utxo = utxo_arg.expect("Missing UTXO argument, please see help.");
+        let outpoint = OutPoint::from_str(utxo)
+            .expect("Could not parse the provided UTXO, please see help for the correct format.");
+        let tx = self
+            .client
+            .esplora
+            .get_tx(&outpoint.txid)
+            .await
+            .map_err(|e| {
+                io::Error::new(
+                    io::ErrorKind::Other,
+                    format!("Esplora failed to retrieve tx: {e}"),
+                )
+            })?;
+        let tx = tx.expect(&format!("Esplora did not find a txid {}", outpoint.txid));
+
+        Ok(Input {
+            outpoint,
+            amount: tx.output[outpoint.vout as usize].value,
+        })
+    }
+
+    pub fn get_funding_amounts_command() -> Command {
+        Command::new("get-funding-amounts")
+            .short_flag('m')
+            .about("Get minimum required amounts for the funding UTXOs (to be used in testing)")
+            .after_help(
+                "This is useful when creating the funding UTXOs for the peg-in and peg-out graphs.",
+            )
+    }
+
+    pub async fn handle_get_funding_amounts(&self) -> io::Result<()> {
+        const INITIAL_AMOUNT: u64 = 2 << 20; // 2097152
+
+        println!("Minimum required input amounts");
+        println!("------------------------------");
+        println!(
+            "'Peg-in deposit' tx input:  {} SAT (spendable by [DEPOSITOR])",
+            INITIAL_AMOUNT + PEG_IN_FEE
+        );
+        println!(
+            "'Peg-out confirm' tx input: {} SAT (spendable by [OPERATOR])",
+            INITIAL_AMOUNT + PEG_OUT_FEE
+        );
+        println!(
+            "'Peg-out' tx input:         {} SAT (spendable by [OPERATOR])",
+            INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_OUT
+        );
+
+        println!();
+        self.handle_get_depositor_address().await?;
+        self.handle_get_operator_address().await?;
+        Ok(())
+    }
+
+    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(&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(&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 evm_address = sub_matches
+            .get_one::<String>("destination_address")
+            .unwrap();
+        let input = self
+            .get_funding_utxo_input(sub_matches.get_one::<String>("utxo"))
+            .await?;
+        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 peg_in_id = sub_matches.get_one::<String>("peg_in_id").unwrap();
+        let input = self
+            .get_funding_utxo_input(sub_matches.get_one::<String>("utxo"))
+            .await?;
+
+        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).expect(
+            "Could not parse the provided UTXO, please see help for the correct format: {e}.",
+        );
+
+        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_commits").about("Broadcast assert commitments"),
+                    )
+                    .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();
+
+        match subcommand.unwrap().1.subcommand() {
+            Some(("assert_commits", _)) => {
+                let result = self
+                    .client
+                    .broadcast_assert_commits(graph_id, &get_proof())
+                    .await;
+                if let Err(e) = result {
+                    println!("Failed to broadcast transaction: {e}");
+                }
+            }
+            Some((others, _)) => {
+                let result = match others {
+                    "deposit" => self.client.broadcast_peg_in_deposit(graph_id).await,
+                    "refund" => self.client.broadcast_peg_in_refund(graph_id).await,
+                    "confirm" => self.client.broadcast_peg_in_confirm(graph_id).await,
+                    "peg_out" => {
+                        let input = self
+                            .get_funding_utxo_input(subcommand.unwrap().1.get_one::<String>("utxo"))
+                            .await?;
+                        let result = self.client.broadcast_peg_out(graph_id, input).await;
+                        self.client.flush().await;
+                        result
+                    }
+                    "peg_out_confirm" => self.client.broadcast_peg_out_confirm(graph_id).await,
+                    "kick_off_1" => self.client.broadcast_kick_off_1(graph_id).await,
+                    "kick_off_2" => self.client.broadcast_kick_off_2(graph_id).await,
+                    "start_time" => self.client.broadcast_start_time(graph_id).await,
+                    "assert_initial" => self.client.broadcast_assert_initial(graph_id).await,
+                    "assert_commit_1_invalid" => {
+                        self.client
+                            .broadcast_assert_commit_1(graph_id, &invalidate_proof(&get_proof()))
+                            .await
+                    }
+                    "assert_commit_2_invalid" => {
+                        self.client
+                            .broadcast_assert_commit_2(graph_id, &invalidate_proof(&get_proof()))
+                            .await
+                    }
+                    "assert_final" => self.client.broadcast_assert_final(graph_id).await,
+                    "take_1" => self.client.broadcast_take_1(graph_id).await,
+                    "take_2" => self.client.broadcast_take_2(graph_id).await,
+                    "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}");
+                }
+            }
+            _ => unreachable!(),
+        }
+
+        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..e84d73521
--- /dev/null
+++ b/bridge/src/client/cli/key_command.rs
@@ -0,0 +1,205 @@
+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/src/bridge/client/cli/mod.rs b/bridge/src/client/cli/mod.rs
similarity index 88%
rename from src/bridge/client/cli/mod.rs
rename to bridge/src/client/cli/mod.rs
index 311415351..4bbf4be67 100644
--- a/src/bridge/client/cli/mod.rs
+++ b/bridge/src/client/cli/mod.rs
@@ -2,4 +2,5 @@ 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/src/bridge/client/cli/query_command.rs b/bridge/src/client/cli/query_command.rs
similarity index 62%
rename from src/bridge/client/cli/query_command.rs
rename to bridge/src/client/cli/query_command.rs
index 4c892b566..dcec86f29 100644
--- a/src/bridge/client/cli/query_command.rs
+++ b/bridge/src/client/cli/query_command.rs
@@ -1,5 +1,5 @@
 use alloy::primitives::Address;
-use bitcoin::{Network, PublicKey, XOnlyPublicKey};
+use bitcoin::{Amount, Network, OutPoint, PublicKey, XOnlyPublicKey};
 use clap::{arg, ArgMatches, Command};
 use core::str::FromStr;
 
@@ -7,22 +7,28 @@ use super::{
     query_response::{Response, ResponseStatus},
     validation::{validate, ArgType},
 };
-use crate::bridge::{
+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,
-    graphs::base::{VERIFIER_0_SECRET, VERIFIER_1_SECRET},
+    scripts::generate_pay_to_pubkey_script_address,
     transactions::base::Input,
 };
 
 pub struct QueryCommand {
     client: BitVMClient,
+    network: Network,
 }
 
-pub const FAKE_SECRET: &str = "1000000000000000000000000000000000000000000000000000000000000000";
+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(
@@ -30,29 +36,29 @@ impl QueryCommand {
         destination_network: DestinationNetwork,
         path_prefix: Option<&str>,
     ) -> Self {
-        let (_, _, verifier_0_public_key) =
-            generate_keys_from_secret(Network::Bitcoin, VERIFIER_0_SECRET);
-        let (_, _, verifier_1_public_key) =
-            generate_keys_from_secret(Network::Bitcoin, VERIFIER_1_SECRET);
+        let (_, verifier_0_public_key) =
+            generate_keys_from_secret(source_network, VERIFIER_0_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 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),
-            Some(FAKE_SECRET),
-            path_prefix,
+            path_prefix.or(Some(QUERY_COMMAND_PATH_PREFIX)),
+            None,
         )
         .await;
 
         Self {
             client: bitvm_client,
+            network: source_network,
         }
     }
 
@@ -61,10 +67,131 @@ impl QueryCommand {
         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 {
@@ -72,10 +199,36 @@ impl QueryCommand {
             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()),
+                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
@@ -89,7 +242,10 @@ impl QueryCommand {
                     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),
+            _ => Response::new(
+                ResponseStatus::NOK("Depositor not found.".to_string()),
+                None,
+            ),
         }
     }
 
@@ -131,7 +287,10 @@ impl QueryCommand {
                     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),
+            _ => Response::new(
+                ResponseStatus::NOK("Withdrawer not found.".to_string()),
+                None,
+            ),
         }
     }
 
@@ -199,7 +358,7 @@ impl QueryCommand {
         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 desination address on L2 Chain").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))
     }
@@ -257,7 +416,7 @@ impl QueryCommand {
         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 desination address on L2 Chain").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))
@@ -383,4 +542,27 @@ impl QueryCommand {
             ),
         }
     }
+
+    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/src/bridge/client/cli/query_response.rs b/bridge/src/client/cli/query_response.rs
similarity index 87%
rename from src/bridge/client/cli/query_response.rs
rename to bridge/src/client/cli/query_response.rs
index c26563ffc..3320012a0 100644
--- a/src/bridge/client/cli/query_response.rs
+++ b/bridge/src/client/cli/query_response.rs
@@ -13,9 +13,14 @@ pub struct Response {
 }
 
 impl Response {
-    pub fn new(status: ResponseStatus, data: Option<Value>) -> Self { Self { status, data } }
+    pub fn new(status: ResponseStatus, data: Option<Value>) -> Self {
+        Self { status, data }
+    }
 
-    pub fn default() -> Self { Self::new(ResponseStatus::NOK("".to_string()), None) }
+    #[allow(clippy::should_implement_trait)]
+    pub fn default() -> Self {
+        Self::new(ResponseStatus::NOK("".to_string()), None)
+    }
 
     pub fn flush(&self) {
         println!(">>>> BitVM Query Response <<<<");
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/src/bridge/client/cli/validation.rs b/bridge/src/client/cli/validation.rs
similarity index 85%
rename from src/bridge/client/cli/validation.rs
rename to bridge/src/client/cli/validation.rs
index ade5dfed2..34d7e9172 100644
--- a/src/bridge/client/cli/validation.rs
+++ b/bridge/src/client/cli/validation.rs
@@ -3,7 +3,7 @@ use bitcoin::{ecdsa, taproot, Amount, Denomination, OutPoint, PublicKey};
 use clap::ArgMatches;
 use core::str::FromStr;
 
-use crate::bridge::constants::DestinationNetwork;
+use crate::constants::DestinationNetwork;
 
 use super::query_response::{Response, ResponseStatus};
 
@@ -48,19 +48,25 @@ pub fn validate(
                 "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()))
+                        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()))
+                        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()))
+                        return Err(error_response(
+                            "Invalid format of ecdsa signature.".to_string(),
+                        ))
                     }
                 },
                 "CONFIRM" | "REFUND" => match taproot::Signature::from_slice(value.as_bytes()) {
diff --git a/bridge/src/client/client.rs b/bridge/src/client/client.rs
new file mode 100644
index 000000000..ca997ea39
--- /dev/null
+++ b/bridge/src/client/client.rs
@@ -0,0 +1,1918 @@
+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 depositor_context = depositor_secret
+            .map(|secret| DepositorContext::new(source_network, secret, n_of_n_public_keys));
+
+        let operator_context = operator_secret
+            .map(|secret| OperatorContext::new(source_network, secret, n_of_n_public_keys));
+
+        let verifier_context = verifier_secret
+            .map(|secret| VerifierContext::new(source_network, secret, n_of_n_public_keys));
+
+        let withdrawer_context = withdrawer_secret
+            .map(|secret| WithdrawerContext::new(source_network, secret, 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
+    }
+
+    /// Get a mutable reference to a PegInGraph by its ID
+    pub fn get_peg_in_graph_mut(&mut self, id: &str) -> Option<&mut PegInGraph> {
+        self.data
+            .peg_in_graphs
+            .iter_mut()
+            .find(|graph| graph.id() == id)
+    }
+
+    /// Get a mutable reference to a PegOutGraph by its ID
+    pub fn get_peg_out_graph_mut(&mut self, id: &str) -> Option<&mut PegOutGraph> {
+        self.data
+            .peg_out_graphs
+            .iter_mut()
+            .find(|graph| graph.id() == id)
+    }
+
+    // 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(&mut latest_file_names).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 (latest_data, _, _) = self.validate_data_by_key(&file_name).await;
+
+                if latest_data.is_some() {
+                    // merge the file if the data is valid
+                    println!("Merging {} data...", { file_name });
+                    self.merge_data(latest_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(
+        &self,
+        file_names: &mut Vec<String>,
+    ) -> (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.validate_data_by_key(&file_name).await;
+                if latest_data.is_some() {
+                    // 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 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 async fn validate_data_by_key(
+        &self,
+        file_name: &str,
+    ) -> (Option<BitVMClientPublicData>, usize, usize) {
+        let result = self
+            .data_store
+            .fetch_compressed_data_by_key(file_name, Some(&self.remote_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 {
+                    if Self::validate_data(&self.esplora, &data).await {
+                        return (Some(data), content.len(), encoded_size);
+                    }
+                } else {
+                    eprintln!("{}", data.err().unwrap());
+                }
+            }
+        }
+
+        (None, 0, 0)
+    }
+
+    pub async fn validate_data(client: &AsyncClient, data: &BitVMClientPublicData) -> bool {
+        println!(
+            "Validating {} PEG-IN graphs and {} PEG-OUT graphs...",
+            data.peg_in_graphs.len(),
+            data.peg_out_graphs.len()
+        );
+        for peg_in_graph in data.peg_in_graphs.iter() {
+            if let Err(err) = peg_in_graph.validate() {
+                eprintln!(
+                    "Encountered invalid peg-in graph (graph ID: {}), with error: {}",
+                    peg_in_graph.id(),
+                    err,
+                );
+
+                return false;
+            }
+        }
+        for peg_out_graph in data.peg_out_graphs.iter() {
+            if let Err(err) = peg_out_graph.validate(client).await {
+                eprintln!(
+                    "Encountered invalid peg-out graph (graph ID: {}), with error: {}",
+                    peg_out_graph.id(),
+                    err,
+                );
+
+                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 at least {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)?;
+
+        let keypair = match (
+            self.depositor_context.as_ref(),
+            self.operator_context.as_ref(),
+            self.verifier_context.as_ref(),
+            self.withdrawer_context.as_ref(),
+        ) {
+            (Some(c), _, _, _) => &c.depositor_keypair,
+            (_, Some(c), _, _) => &c.operator_keypair,
+            (_, _, Some(c), _) => &c.verifier_keypair,
+            (_, _, _, Some(c)) => &c.withdrawer_keypair,
+            _ => Err(Error::Client(ClientError::NoUserContextDefined))?,
+        };
+
+        let tx = graph
+            .challenge(
+                &self.esplora,
+                crowdfundng_inputs,
+                keypair,
+                output_script_pubkey,
+            )
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    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
+    }
+
+    // use this when possible
+    // broadcast assert commits together to save groth16 verifying time
+    pub async fn broadcast_assert_commits(
+        &mut self,
+        peg_out_graph_id: &String,
+        proof: &RawProof,
+    ) -> Result<(Txid, Txid), Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let (commit1_tx, commit2_tx) = graph
+            .assert_commits(
+                &self.esplora,
+                &self.private_data.commitment_secrets
+                    [&self.operator_context.as_ref().unwrap().operator_public_key]
+                    [peg_out_graph_id],
+                proof,
+            )
+            .await?;
+        Ok((
+            self.broadcast_tx(&commit1_tx).await?,
+            self.broadcast_tx(&commit2_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(),
+            )))
+    }
+
+    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 68%
rename from src/bridge/client/data_store/aws_s3.rs
rename to bridge/src/client/data_store/aws_s3.rs
index ae31d0ffd..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::{
@@ -55,25 +60,21 @@ impl AwsS3 {
             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(
@@ -134,8 +135,12 @@ 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);
@@ -148,19 +153,48 @@ impl DataStoreDriver for AwsS3 {
         }
     }
 
-    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());
+
+        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)),
+        }
+    }
 
-        // println!("Writing data file to {} (size: {})", key, size);
+    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/src/bridge/client/data_store/data_store.rs b/bridge/src/client/data_store/data_store.rs
similarity index 50%
rename from src/bridge/client/data_store/data_store.rs
rename to bridge/src/client/data_store/data_store.rs
index 9ccfb43e8..aea23adb5 100644
--- a/src/bridge/client/data_store/data_store.rs
+++ b/bridge/src/client/data_store/data_store.rs
@@ -1,9 +1,9 @@
-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::local_file::LocalFile;
 use super::{
     aws_s3::AwsS3,
     ftp::{ftp::Ftp, ftps::Ftps},
@@ -13,30 +13,39 @@ use super::{
 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());
+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>,
+    local_file: Option<LocalFile>,
 }
 
 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,
+            local_file: LocalFile::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();
+    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 {
@@ -59,7 +68,7 @@ impl DataStore {
 
                     data_keys = data_keys
                         .iter()
-                        .filter(|key| CLIENT_DATA_REGEX.is_match(key))
+                        .filter(|key| self.client_data_regex.is_match(key))
                         .cloned()
                         .collect();
                     data_keys.sort_by(|x, y| {
@@ -84,10 +93,10 @@ impl DataStore {
     ) -> Result<Option<String>, String> {
         match self.get_driver() {
             Ok(driver) => {
-                let json = driver.fetch_json(key, file_path).await;
-                if json.is_ok() {
+                let json = driver.fetch_object(key, file_path).await;
+                if let Ok(data) = json {
                     // println!("Fetched data file: {}", key);
-                    return Ok(Some(json.unwrap()));
+                    return Ok(Some(data));
                 }
 
                 println!("No data file {} found", key);
@@ -99,7 +108,7 @@ impl DataStore {
 
     pub async fn write_data(
         &self,
-        json: String,
+        contents: &String,
         file_path: Option<&str>,
     ) -> Result<String, String> {
         match self.get_driver() {
@@ -108,11 +117,11 @@ impl DataStore {
                     .duration_since(UNIX_EPOCH)
                     .unwrap()
                     .as_millis();
-                let key = Self::create_file_name(time);
-                let response = driver.upload_json(&key, json, file_path).await;
+                let file_name = self.create_file_name(time);
+                let response = driver.upload_object(&file_name, contents, file_path).await;
 
                 match response {
-                    Ok(_) => Ok(key),
+                    Ok(_) => Ok(file_name),
                     Err(_) => Err(String::from("Failed to save data file")),
                 }
             }
@@ -120,27 +129,76 @@ impl DataStore {
         }
     }
 
-    pub fn get_past_max_file_name_by_timestamp(latest_timestamp: u64, period: u64) -> String {
+    pub async fn fetch_compressed_data_by_key(
+        &self,
+        key: &str,
+        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)
+        self.create_file_name(past_max_timestamp)
     }
 
-    fn create_file_name(timestamp: u128) -> String {
-        format!("{}{}", timestamp, CLIENT_DATA_SUFFIX)
+    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() {
+        if self.local_file.is_some() {
+            Ok(self.local_file.as_ref().unwrap())
+        } else if self.aws_s3.is_some() {
             Ok(self.aws_s3.as_ref().unwrap())
         } else if self.ftp.is_some() {
-            return Ok(self.ftp.as_ref().unwrap());
+            Ok(self.ftp.as_ref().unwrap())
         } else if self.ftps.is_some() {
-            return Ok(self.ftps.as_ref().unwrap());
+            Ok(self.ftps.as_ref().unwrap())
         } else if self.sftp.is_some() {
-            return Ok(self.sftp.as_ref().unwrap());
+            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 67%
rename from src/bridge/client/data_store/ftp/ftp.rs
rename to bridge/src/client/data_store/ftp/ftp.rs
index c047ccbfe..71897cc68 100644
--- a/src/bridge/client/data_store/ftp/ftp.rs
+++ b/bridge/src/client/data_store/ftp/ftp.rs
@@ -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 68%
rename from src/bridge/client/data_store/ftp/ftps.rs
rename to bridge/src/client/data_store/ftp/ftps.rs
index 1a0a01d8b..9225ea0d1 100644
--- a/src/bridge/client/data_store/ftp/ftps.rs
+++ b/bridge/src/client/data_store/ftp/ftps.rs
@@ -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 84%
rename from src/bridge/client/data_store/ftp/lib.rs
rename to bridge/src/client/data_store/ftp/lib.rs
index dda0b50bc..8810799b5 100644
--- a/src/bridge/client/data_store/ftp/lib.rs
+++ b/bridge/src/client/data_store/ftp/lib.rs
@@ -4,6 +4,11 @@ use suppaftp::{
     AsyncNativeTlsFtpStream,
 };
 
+use crate::{
+    error::err_to_string,
+    utils::{compress, decompress, DEFAULT_COMPRESSION_LEVEL},
+};
+
 pub struct FtpCredentials {
     pub is_secure: bool,
     pub host: String,
@@ -68,12 +73,12 @@ pub async fn list_objects(
     }
 }
 
-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);
@@ -86,18 +91,56 @@ pub async fn fetch_json(
     }
 }
 
-pub async fn upload_json(
+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_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;
-                                    Err(format!("Unable to write {}: {}", key, err))
+                                    Err(format!("Unable to write {}: {}", file_name, err))
                                 }
                             },
                             Err(err) => {
                                 disconnect(None, Some(&mut ftp_stream)).await;
-                                Err(format!("Unable to write {}: {}", key, err))
+                                Err(format!("Unable to write {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(None, Some(&mut ftp_stream)).await;
-                            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;
-                                    Err(format!("Unable to write {}: {}", key, err))
+                                    Err(format!("Unable to write {}: {}", file_name, err))
                                 }
                             },
                             Err(err) => {
                                 disconnect(Some(&mut ftp_stream), None).await;
-                                Err(format!("Unable to write {}: {}", key, err))
+                                Err(format!("Unable to write {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(Some(&mut ftp_stream), None).await;
-                            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)),
         }
     }
 }
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/bridge/src/client/data_store/local_file.rs b/bridge/src/client/data_store/local_file.rs
new file mode 100644
index 000000000..98c1a7823
--- /dev/null
+++ b/bridge/src/client/data_store/local_file.rs
@@ -0,0 +1,168 @@
+use crate::{
+    error::err_to_string,
+    utils::{compress, decompress, DEFAULT_COMPRESSION_LEVEL},
+};
+
+use super::base::DataStoreDriver;
+use async_trait::async_trait;
+use dotenv;
+
+pub const TEST_DATA_DIRECTORY_NAME: &str = "test_data";
+const DATA_STORE_DIRECTORY_NAME: &str = "shared_file_store";
+// To use this data store, create a .env file in the base directory with the following values:
+// export BRIDGE_USE_LOCAL_FILE_DATA_STORE=true
+// This data store driver will only be used in testing, DO NOT use in production
+pub struct LocalFile {
+    base_path: std::path::PathBuf,
+}
+
+impl LocalFile {
+    pub fn new() -> Option<Self> {
+        dotenv::dotenv().ok();
+        let env_var = dotenv::var("BRIDGE_USE_LOCAL_FILE_DATA_STORE");
+
+        if env_var.is_err()
+            || env_var.is_ok_and(|v| {
+                let flag = v.parse::<bool>();
+                flag.is_err() || !flag.is_ok_and(|f| f)
+            })
+        {
+            return None;
+        } else if !cfg!(debug_assertions) {
+            println!("Disabling local file data store in release mode, please remove BRIDGE_USE_LOCAL_FILE_DATA_STORE or set it to false in .env");
+            return None;
+        }
+
+        let base_path =
+            std::path::Path::new(TEST_DATA_DIRECTORY_NAME).join(DATA_STORE_DIRECTORY_NAME);
+        if !base_path.exists() {
+            if let Err(e) = std::fs::create_dir_all(&base_path) {
+                eprintln!("Failed to create shared file store base path: {e}");
+                return None;
+            }
+        }
+
+        Some(Self { base_path })
+    }
+
+    async fn get_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> std::io::Result<Vec<u8>> {
+        let path = match file_path {
+            Some(file_path) => self.base_path.join(file_path).join(file_name),
+            None => self.base_path.join(file_name),
+        };
+
+        std::fs::read(path)
+    }
+
+    async fn upload_object(
+        &self,
+        file_name: &str,
+        data: Vec<u8>,
+        file_path: Option<&str>,
+    ) -> std::io::Result<()> {
+        let path = match file_path {
+            Some(file_path) => self.base_path.join(file_path).join(file_name),
+            None => self.base_path.join(file_name),
+        };
+        if let Some(parent) = path.parent() {
+            if !parent.exists() {
+                std::fs::create_dir_all(parent)?;
+            }
+        }
+
+        std::fs::write(path, data)
+    }
+}
+
+#[async_trait]
+impl DataStoreDriver for LocalFile {
+    async fn list_objects(&self, file_path: Option<&str>) -> Result<Vec<String>, String> {
+        let path = match file_path {
+            Some(file_path) => self.base_path.join(file_path),
+            None => self.base_path.clone(),
+        };
+        if !path.exists() {
+            std::fs::create_dir_all(&path).map_err(err_to_string)?;
+        }
+        let paths = std::fs::read_dir(path).unwrap();
+
+        Ok(paths
+            .filter_map(|path| {
+                path.ok()
+                    .filter(|path| path.path().is_file())
+                    .map(|p| p.path().to_string_lossy().to_string())
+            })
+            .collect())
+    }
+
+    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();
+        let data = contents.as_bytes().to_vec();
+
+        match self.upload_object(file_name, data, 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();
+
+        match self
+            .upload_object(file_name, compressed_data, file_path)
+            .await
+        {
+            Ok(_) => Ok(size),
+            Err(err) => Err(format!("Failed to save json file: {}", err)),
+        }
+    }
+}
diff --git a/src/bridge/client/data_store/mod.rs b/bridge/src/client/data_store/mod.rs
similarity index 79%
rename from src/bridge/client/data_store/mod.rs
rename to bridge/src/client/data_store/mod.rs
index 2dcfb042b..20d2db499 100644
--- a/src/bridge/client/data_store/mod.rs
+++ b/bridge/src/client/data_store/mod.rs
@@ -2,4 +2,5 @@ pub mod aws_s3;
 pub mod base;
 pub mod data_store;
 pub mod ftp;
+pub mod local_file;
 pub mod sftp;
diff --git a/src/bridge/client/data_store/sftp.rs b/bridge/src/client/data_store/sftp.rs
similarity index 85%
rename from src/bridge/client/data_store/sftp.rs
rename to bridge/src/client/data_store/sftp.rs
index 6931a42e6..8e8dd091f 100644
--- a/src/bridge/client/data_store/sftp.rs
+++ b/bridge/src/client/data_store/sftp.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 dotenv;
@@ -104,7 +109,7 @@ impl Sftp {
     async fn upload_object(
         &self,
         key: &str,
-        data: &Vec<u8>,
+        data: &[u8],
         file_path: Option<&str>,
     ) -> Result<(), String> {
         match connect(&self.credentials).await {
@@ -134,10 +139,7 @@ impl Sftp {
                                         Err(err) => {
                                             drop(file);
                                             disconnect(sftp).await;
-                                            Err(format!(
-                                                "Unable to write {}: {}",
-                                                key, err
-                                            ))
+                                            Err(format!("Unable to write {}: {}", key, err))
                                         }
                                     },
                                     Err(err) => {
@@ -190,8 +192,12 @@ impl DataStoreDriver for Sftp {
         }
     }
 
-    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);
@@ -204,18 +210,56 @@ impl DataStoreDriver for Sftp {
         }
     }
 
-    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 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 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 self.upload_object(key, &bytes, file_path).await {
+        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)),
         }
@@ -278,10 +322,7 @@ async fn connect(credentials: &SftpCredentials) -> Result<_Sftp, String> {
 async fn disconnect(sftp: _Sftp) {
     let result = sftp.close().await;
     if result.is_err() {
-        eprintln!(
-            "Unable to close connection: {}",
-            result.err().unwrap()
-        );
+        eprintln!("Unable to close connection: {}", result.err().unwrap());
     }
 }
 
diff --git a/bridge/src/client/esplora.rs b/bridge/src/client/esplora.rs
new file mode 100644
index 000000000..fe9c1f99b
--- /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..16244b6aa
--- /dev/null
+++ b/bridge/src/client/memory_cache.rs
@@ -0,0 +1,68 @@
+use std::{
+    borrow::Borrow,
+    hash::Hash,
+    num::NonZeroUsize,
+    sync::{LazyLock, RwLock},
+};
+
+use lru::LruCache;
+
+use crate::connectors::base::{LockScriptCacheEntry, TaprootSpendInfoCacheEntry};
+
+const DEFAULT_CACHE_SIZE: usize = 1000;
+pub(crate) static TAPROOT_SPEND_INFO_CACHE: LazyLock<
+    RwLock<Cache<String, TaprootSpendInfoCacheEntry>>,
+> = LazyLock::new(|| RwLock::new(Cache::new(DEFAULT_CACHE_SIZE)));
+pub(crate) static TAPROOT_LOCK_SCRIPTS_CACHE: LazyLock<
+    RwLock<Cache<String, LockScriptCacheEntry>>,
+> = LazyLock::new(|| RwLock::new(Cache::new(DEFAULT_CACHE_SIZE)));
+
+pub struct Cache<K: Eq + Hash, V>(LruCache<K, V>);
+
+impl<K, V> Cache<K, V>
+where
+    K: Eq + Hash,
+    V: Clone,
+{
+    fn new(cap: usize) -> Self {
+        Self(LruCache::new(NonZeroUsize::new(cap).unwrap()))
+    }
+
+    pub fn put(&mut self, key: K, value: V) -> Option<V> {
+        self.0.put(key, value)
+    }
+
+    pub fn push(&mut self, key: K, value: V) -> Option<(K, V)> {
+        self.0.push(key, value)
+    }
+
+    pub fn get<Q: ?Sized>(&mut self, key: &Q) -> Option<&V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get(key)
+    }
+
+    pub fn get_or_put<F>(&mut self, key: K, f: F) -> &V
+    where
+        F: FnOnce() -> V,
+    {
+        self.0.get_or_insert(key, f)
+    }
+
+    pub fn try_get_or_insert<F, E>(&mut self, k: K, f: F) -> Result<&V, E>
+    where
+        F: FnOnce() -> Result<V, E>,
+    {
+        self.0.try_get_or_insert(k, f)
+    }
+
+    pub fn contains<Q: ?Sized>(&self, key: &Q) -> bool
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.contains(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/src/bridge/client/sdk/mod.rs b/bridge/src/client/sdk/mod.rs
similarity index 100%
rename from src/bridge/client/sdk/mod.rs
rename to bridge/src/client/sdk/mod.rs
diff --git a/src/bridge/client/sdk/query.rs b/bridge/src/client/sdk/query.rs
similarity index 96%
rename from src/bridge/client/sdk/query.rs
rename to bridge/src/client/sdk/query.rs
index 0ae26ed00..ebf71e383 100644
--- a/src/bridge/client/sdk/query.rs
+++ b/bridge/src/client/sdk/query.rs
@@ -4,7 +4,7 @@ use bitcoin::{PublicKey, XOnlyPublicKey};
 use esplora_client::AsyncClient;
 use serde_json::Value;
 
-use crate::bridge::transactions::base::Input;
+use crate::transactions::base::Input;
 
 use super::query_contexts::depositor_signatures::DepositorSignatures;
 
diff --git a/src/bridge/client/sdk/query_contexts/depositor_signatures.rs b/bridge/src/client/sdk/query_contexts/depositor_signatures.rs
similarity index 100%
rename from src/bridge/client/sdk/query_contexts/depositor_signatures.rs
rename to bridge/src/client/sdk/query_contexts/depositor_signatures.rs
diff --git a/src/bridge/client/sdk/query_contexts/mod.rs b/bridge/src/client/sdk/query_contexts/mod.rs
similarity index 100%
rename from src/bridge/client/sdk/query_contexts/mod.rs
rename to bridge/src/client/sdk/query_contexts/mod.rs
diff --git a/bridge/src/commitments.rs b/bridge/src/commitments.rs
new file mode 100644
index 000000000..354bf3a08
--- /dev/null
+++ b/bridge/src/commitments.rs
@@ -0,0 +1,163 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumIter, IntoEnumIterator};
+
+use bitvm::{
+    chunk::api::{NUM_HASH, NUM_PUBS, NUM_U256},
+    signatures::signing_winternitz::WinternitzSecret,
+    signatures::HASH_LEN,
+};
+
+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_HASH {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((
+                    format!("{}", i + NUM_PUBS + NUM_U256),
+                    HASH_LEN,
+                )),
+                WinternitzSecret::new(HASH_LEN),
+            );
+        }
+
+        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/src/bridge/connectors/base.rs b/bridge/src/connectors/base.rs
similarity index 74%
rename from src/bridge/connectors/base.rs
rename to bridge/src/connectors/base.rs
index 78c24a28b..7cdd8445b 100644
--- a/src/bridge/connectors/base.rs
+++ b/bridge/src/connectors/base.rs
@@ -1,4 +1,9 @@
-use bitcoin::{taproot::TaprootSpendInfo, Address, ScriptBuf, Sequence, TxIn, Witness};
+use bitcoin::{
+    key::TweakedPublicKey,
+    taproot::{ControlBlock, TaprootSpendInfo},
+    Address, ScriptBuf, Sequence, TapNodeHash, TxIn, Witness,
+};
+use serde::{Deserialize, Serialize};
 
 use super::super::transactions::base::Input;
 
@@ -22,7 +27,7 @@ pub fn generate_timelock_tx_in(input: &Input, num_blocks: u32) -> TxIn {
 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.
+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.
@@ -44,6 +49,29 @@ pub trait P2wshConnector {
     fn generate_tx_in(&self, input: &Input) -> TxIn;
 }
 
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct TaprootSpendInfoCacheEntry {
+    pub merkle_root: Option<TapNodeHash>,
+    pub output_key: TweakedPublicKey,
+    pub scripts_length: usize,
+}
+
+impl TaprootSpendInfoCacheEntry {
+    pub fn new(spend_info: &TaprootSpendInfo, scripts_length: usize) -> Self {
+        Self {
+            merkle_root: spend_info.merkle_root(),
+            output_key: spend_info.output_key(),
+            scripts_length,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct LockScriptCacheEntry {
+    pub control_block: ControlBlock,
+    pub encoded_script: Vec<u8>, // compressed bitcoin::Script
+}
+
 pub trait TaprootConnector {
     fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf;
 
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 b6070fd13..1f581f2c6 100644
--- a/src/bridge/connectors/connector_0.rs
+++ b/bridge/src/connectors/connector_0.rs
@@ -1,8 +1,8 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -28,13 +28,17 @@ impl Connector0 {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector0 {
@@ -60,7 +64,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 88%
rename from src/bridge/connectors/connector_1.rs
rename to bridge/src/connectors/connector_1.rs
index 8bba26c56..5a936f4af 100644
--- a/src/bridge/connectors/connector_1.rs
+++ b/bridge/src/connectors/connector_1.rs
@@ -1,19 +1,21 @@
 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::bridge::{
-        graphs::peg_out::CommitmentMessageId,
-        superblock::{
-            SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH
-        }, transactions::signing_winternitz::{winternitz_message_checksig_verify, WinternitzPublicKey},
-    };
+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::{
@@ -59,12 +61,12 @@ impl Connector1 {
 
     fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
         let superblock_public_key = &self.commitment_public_keys[&CommitmentMessageId::Superblock];
-        let superblock_hash_public_key = &self.commitment_public_keys
-            [&CommitmentMessageId::SuperblockHash];
+        let superblock_hash_public_key =
+            &self.commitment_public_keys[&CommitmentMessageId::SuperblockHash];
 
         script! {
-            { winternitz_message_checksig_verify(superblock_hash_public_key, SUPERBLOCK_HASH_MESSAGE_LENGTH) }
-            { winternitz_message_checksig_verify(superblock_public_key, SUPERBLOCK_MESSAGE_LENGTH) }
+            { 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
@@ -128,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/src/bridge/connectors/connector_2.rs b/bridge/src/connectors/connector_2.rs
similarity index 85%
rename from src/bridge/connectors/connector_2.rs
rename to bridge/src/connectors/connector_2.rs
index 9cda9d3d0..31172c29e 100644
--- a/src/bridge/connectors/connector_2.rs
+++ b/bridge/src/connectors/connector_2.rs
@@ -1,22 +1,25 @@
 use std::collections::HashMap;
 
 use crate::{
-    bridge::{
-        constants::{N_SEQUENCE_FOR_LOCK_TIME, START_TIME_MESSAGE_LENGTH}, graphs::peg_out::CommitmentMessageId, transactions::signing_winternitz::{winternitz_message_checksig, WinternitzPublicKey},
-    }, signatures::utils::bytes_to_number, treepp::script
+    commitments::CommitmentMessageId,
+    constants::{N_SEQUENCE_FOR_LOCK_TIME, START_TIME_MESSAGE_LENGTH},
 };
 use bitcoin::{
-    key::Secp256k1,
     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,
-    },
+    super::{scripts::*, transactions::base::Input},
     base::*,
 };
 
@@ -54,7 +57,7 @@ impl Connector2 {
             // 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) }
-            { bytes_to_number::<{ START_TIME_MESSAGE_LENGTH }>() }
+            { digits_to_number::<{ START_TIME_MESSAGE_LENGTH * 2}, { LOG_D as usize }>() }
             OP_CLTV
             OP_DROP
             { self.operator_taproot_public_key }
@@ -71,7 +74,9 @@ impl Connector2 {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector2 {
@@ -97,7 +102,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/src/bridge/connectors/connector_3.rs b/bridge/src/connectors/connector_3.rs
similarity index 92%
rename from src/bridge/connectors/connector_3.rs
rename to bridge/src/connectors/connector_3.rs
index a9ce5c64d..58850739d 100644
--- a/src/bridge/connectors/connector_3.rs
+++ b/bridge/src/connectors/connector_3.rs
@@ -3,9 +3,9 @@ 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},
     },
     base::*,
 };
diff --git a/src/bridge/connectors/connector_4.rs b/bridge/src/connectors/connector_4.rs
similarity index 92%
rename from src/bridge/connectors/connector_4.rs
rename to bridge/src/connectors/connector_4.rs
index 78d3350b5..18d1ac911 100644
--- a/src/bridge/connectors/connector_4.rs
+++ b/bridge/src/connectors/connector_4.rs
@@ -3,9 +3,9 @@ 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},
     },
     base::*,
 };
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 05bb074ba..2a680a86d 100644
--- a/src/bridge/connectors/connector_5.rs
+++ b/bridge/src/connectors/connector_5.rs
@@ -1,8 +1,8 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -28,13 +28,17 @@ impl Connector5 {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector5 {
@@ -60,7 +64,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/src/bridge/connectors/connector_6.rs b/bridge/src/connectors/connector_6.rs
similarity index 82%
rename from src/bridge/connectors/connector_6.rs
rename to bridge/src/connectors/connector_6.rs
index 2791cfe2b..d0d6dd2e2 100644
--- a/src/bridge/connectors/connector_6.rs
+++ b/bridge/src/connectors/connector_6.rs
@@ -1,22 +1,22 @@
 use std::collections::HashMap;
 
 use crate::{
-    bridge::{
-        constants::DESTINATION_NETWORK_TXID_LENGTH,
-        graphs::peg_out::CommitmentMessageId,
-        transactions::{
-            base::Input,
-            signing_winternitz::{winternitz_message_checksig_verify, WinternitzPublicKey},
-        },
-    },
+    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::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
 
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::base::{generate_default_tx_in, TaprootConnector};
@@ -47,14 +47,16 @@ impl Connector6 {
         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) }
-            { winternitz_message_checksig_verify(source_network_txid_public_key, DESTINATION_NETWORK_TXID_LENGTH) }
+            { 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) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector6 {
@@ -76,7 +78,7 @@ impl TaprootConnector for Connector6 {
         TaprootBuilder::new()
             .add_leaf(0, self.generate_taproot_leaf_0_script())
             .expect("Unable to add leaf 0")
-            .finalize(&Secp256k1::new(), self.operator_taproot_public_key) // TODO: should be operator key?
+            .finalize(SECP256K1, self.operator_taproot_public_key) // TODO: should be operator key?
             .expect("Unable to finalize taproot")
     }
 
@@ -86,4 +88,4 @@ impl TaprootConnector for Connector6 {
             self.network,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/src/bridge/connectors/connector_a.rs b/bridge/src/connectors/connector_a.rs
similarity index 92%
rename from src/bridge/connectors/connector_a.rs
rename to bridge/src/connectors/connector_a.rs
index 9a7f4cf8d..4eaf50920 100644
--- a/src/bridge/connectors/connector_a.rs
+++ b/bridge/src/connectors/connector_a.rs
@@ -1,8 +1,8 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -34,13 +34,17 @@ impl ConnectorA {
         generate_pay_to_pubkey_taproot_script(&self.operator_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.operator_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorA {
@@ -66,7 +70,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..dc1e548bf
--- /dev/null
+++ b/bridge/src/connectors/connector_b.rs
@@ -0,0 +1,360 @@
+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]
+    fn test_connector_b_leaf_2_script() {
+        const TWO_WEEKS_IN_SECONDS: u32 = 60 * 60 * 24 * 14;
+
+        // Setup test headers appropriately for the verification in the script to pass
+        let start_time = get_start_time_block_number(Regtest);
+
+        // Create a baseline header
+        let base_header = get_superblock_header();
+
+        // Create committed superblock with lower weight (higher hash value)
+        // Higher bits value = lower difficulty/weight
+        let mut committed_sb = base_header.clone();
+        committed_sb.bits = CompactTarget::from_hex("0x1d030ecd").unwrap(); // Much lower difficulty
+
+        // Create disprove superblock with higher weight (lower hash value)
+        // Lower bits value = higher difficulty/weight
+        let mut disprove_sb = base_header;
+        disprove_sb.bits = CompactTarget::from_hex("0x17030ecd").unwrap(); // Much higher difficulty
+
+        // Make them distinct blocks with very different hashes
+        committed_sb.nonce = 0x12345678;
+        disprove_sb.nonce = 0x87654321;
+        committed_sb.merkle_root = TxMerkleNode::from_str(
+            "1064b0d54f20412756ba7ce07b0594f3548b06f2dad5cfeaac2aca508634ed19",
+        )
+        .unwrap();
+        disprove_sb.merkle_root = TxMerkleNode::from_str(
+            "2064b0d54f20412756ba7ce07b0594f3548b06f2dad5cfeaac2aca508634ed19",
+        )
+        .unwrap();
+
+        // Set times to satisfy time constraints:
+        // 1. disprove_sb.time > start_time
+        // 2. disprove_sb.time < start_time + 2 weeks
+        committed_sb.time = start_time - 100; // Some time before start_time (doesn't matter for test)
+        disprove_sb.time = start_time + 1000; // Some time after start_time but less than 2 weeks
+
+        // Debug print to verify the targets and hashes
+        println!("Committed SB bits: {:?}", committed_sb.bits);
+        println!("Disprove SB bits: {:?}", disprove_sb.bits);
+
+        // Calculate and print actual block hashes for debugging
+        let committed_hash = committed_sb.block_hash();
+        let disprove_hash = disprove_sb.block_hash();
+        println!("Committed SB hash: {}", committed_hash);
+        println!("Disprove SB hash: {}", disprove_hash);
+
+        // Directly compare the hashes without serialization
+        // Lower hash value means higher weight in Bitcoin
+        assert!(disprove_hash < committed_hash, "Disprove superblock is not heavier than committed superblock! Test precondition failed.");
+        println!("Is disprove SB heavier: true (verified by direct hash comparison)");
+
+        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 = start_time.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);
+
+        if !result.success {
+            println!(
+                "Script execution failed. Final stack: {:?}",
+                result.final_stack
+            );
+            if let Some(error) = result.error {
+                println!("Script error: {:?}", error);
+            }
+        }
+
+        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..063a2c70e
--- /dev/null
+++ b/bridge/src/connectors/connector_c.rs
@@ -0,0 +1,345 @@
+use std::{
+    collections::BTreeMap,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    client::{
+        files::BRIDGE_DATA_DIRECTORY_NAME,
+        memory_cache::{TAPROOT_LOCK_SCRIPTS_CACHE, TAPROOT_SPEND_INFO_CACHE},
+    },
+    commitments::CommitmentMessageId,
+    common::ZkProofVerifyingKey,
+    connectors::base::*,
+    error::{ChunkerError, Error},
+    transactions::base::Input,
+    utils::{
+        cleanup_cache_files, compress, decompress, read_disk_cache,
+        remove_script_and_control_block_from_witness, write_disk_cache,
+    },
+};
+use bitcoin::{
+    hashes::{hash160, Hash},
+    hex::DisplayHex,
+    key::TweakedPublicKey,
+    taproot::{ControlBlock, LeafVersion, TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TapNodeHash, Transaction, TxIn, XOnlyPublicKey,
+};
+use num_traits::ToPrimitive;
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+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, winternitz},
+};
+use zstd::DEFAULT_COMPRESSION_LEVEL;
+
+// 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(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorC {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    commitment_public_keys: BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl ConnectorC {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        assert!(
+            !commitment_public_keys.is_empty(),
+            "commitment_public_keys is empty"
+        );
+        ConnectorC {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            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> {
+        println!("Generating disprove witness ...");
+        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.public_key)
+            .collect::<Vec<&winternitz::PublicKey>>();
+
+        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<ScriptBuf> = self
+            .lock_scripts_bytes()
+            .into_iter()
+            .map(|f| 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_cached().merkle_root
+    }
+
+    pub fn taproot_output_key(&self) -> TweakedPublicKey {
+        self.taproot_spend_info_cached().output_key
+    }
+
+    pub fn taproot_scripts_len(&self) -> usize {
+        self.taproot_spend_info_cached().scripts_length
+    }
+
+    pub fn taproot_script_and_control_block(&self, leaf_index: usize) -> (ScriptBuf, ControlBlock) {
+        let cache_id = lock_script_cache_id(&self.commitment_public_keys, leaf_index);
+        let cache = TAPROOT_LOCK_SCRIPTS_CACHE
+            .write()
+            .unwrap()
+            .get_or_put(cache_id, || {
+                let (script, control_block) = generate_script_and_control_block(
+                    self.operator_taproot_public_key,
+                    &self.lock_scripts_bytes(),
+                    leaf_index,
+                );
+                let encoded_data = bitcode::encode(script.as_bytes());
+                let compressed_data = compress(&encoded_data, DEFAULT_COMPRESSION_LEVEL)
+                    .expect("Unable to compress script for caching");
+                LockScriptCacheEntry {
+                    control_block,
+                    encoded_script: compressed_data,
+                }
+            })
+            .clone();
+        decompress(&cache.encoded_script)
+            .ok()
+            .map(|data| (data, cache.control_block))
+            .and_then(|(encoded, control_block)| {
+                bitcode::decode::<Vec<u8>>(&encoded)
+                    .ok()
+                    .map(|decoded| (ScriptBuf::from(decoded), control_block))
+            })
+            .expect("Cached script data corrupted")
+    }
+
+    fn taproot_spend_info_cached(&self) -> TaprootSpendInfoCacheEntry {
+        let cache_id = spend_info_cache_id(&self.commitment_public_keys);
+        TAPROOT_SPEND_INFO_CACHE
+            .write()
+            .unwrap()
+            .get_or_put(cache_id, || {
+                let lock_scripts_bytes = &self.lock_scripts_bytes();
+                let spend_info = generate_taproot_spend_info(
+                    self.operator_taproot_public_key,
+                    lock_scripts_bytes,
+                );
+                TaprootSpendInfoCacheEntry::new(&spend_info, lock_scripts_bytes.len())
+            })
+            .clone()
+    }
+
+    fn lock_scripts_bytes(&self) -> Vec<Vec<u8>> {
+        let cache_id = spend_info_cache_id(&self.commitment_public_keys);
+        let file_path = get_lock_scripts_cache_path(&cache_id);
+        let lock_scripts_bytes = read_disk_cache(&file_path)
+            .inspect_err(|e| {
+                if e.kind() != std::io::ErrorKind::NotFound {
+                    eprintln!(
+                        "Failed to read lock scripts cache from expected location: {}",
+                        e
+                    );
+                }
+            })
+            .unwrap_or_else(|_| generate_assert_leaves(&self.commitment_public_keys));
+        if !file_path.exists() {
+            write_disk_cache(&file_path, &lock_scripts_bytes)
+                .inspect_err(|e| eprintln!("Failed to write lock scripts cache to disk: {}", e))
+                .ok();
+        }
+        cleanup_cache_files(
+            LOCK_SCRIPTS_FILE_PREFIX,
+            file_path.parent().unwrap(),
+            MAX_CACHE_FILES,
+        );
+
+        lock_scripts_bytes
+    }
+}
+
+impl TaprootConnector for ConnectorC {
+    fn generate_taproot_leaf_script(&self, _: u32) -> ScriptBuf {
+        // use taproot_script_and_control_block to get cached script and control block
+        unreachable!("Cache is not used for leaf scripts");
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        let index = leaf_index.to_usize().unwrap();
+        if index >= self.taproot_scripts_len() {
+            panic!("Invalid leaf index.")
+        }
+        generate_default_tx_in(input)
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        // use taproot_merkle_root/taproot_output_key/taproot_scripts_len to get cached spend info fields
+        unreachable!("Cache is not used for taproot spend info");
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(self.taproot_output_key(), self.network)
+    }
+}
+
+fn first_winternitz_public_key_bytes(
+    commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+) -> Vec<u8> {
+    let (_, first_winternitz_public_key) = commitment_public_keys
+        .iter()
+        .next()
+        .expect("commitment_public_keys should not be empty");
+    first_winternitz_public_key
+        .public_key
+        .as_flattened()
+        .to_vec()
+}
+
+fn spend_info_cache_id(
+    commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+) -> String {
+    let bytes = first_winternitz_public_key_bytes(commitment_public_keys);
+    let hash = hash160::Hash::hash(&bytes);
+    hash.as_byte_array().to_lower_hex_string()
+}
+
+fn lock_script_cache_id(
+    commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    leaf_index: usize,
+) -> String {
+    let mut bytes = first_winternitz_public_key_bytes(commitment_public_keys);
+    bytes.append(leaf_index.to_be_bytes().to_vec().as_mut());
+    let hash = hash160::Hash::hash(&bytes);
+    hash.as_byte_array().to_lower_hex_string()
+}
+
+fn generate_script_and_control_block(
+    operator_taproot_public_key: XOnlyPublicKey,
+    lock_scripts_bytes: &Vec<Vec<u8>>,
+    leaf_index: usize,
+) -> (ScriptBuf, ControlBlock) {
+    let spend_info = generate_taproot_spend_info(operator_taproot_public_key, lock_scripts_bytes);
+    let script = ScriptBuf::from(lock_scripts_bytes[leaf_index].clone());
+    let prevout_leaf = (script, LeafVersion::TapScript);
+    let control_block = spend_info
+        .control_block(&prevout_leaf)
+        .expect("Unable to create Control block");
+    (prevout_leaf.0, control_block)
+}
+
+fn generate_taproot_spend_info(
+    operator_taproot_public_key: XOnlyPublicKey,
+    lock_scripts_bytes: &Vec<Vec<u8>>,
+) -> TaprootSpendInfo {
+    println!("Generating new taproot spend info for connector C...");
+    let script_weights = lock_scripts_bytes
+        .iter()
+        .map(|b| (1, ScriptBuf::from_bytes(b.clone())));
+    TaprootBuilder::with_huffman_tree(script_weights)
+        .expect("Unable to add assert leaves")
+        .finalize(SECP256K1, operator_taproot_public_key)
+        .expect("Unable to finalize assert transaction connector c taproot")
+}
+
+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.public_key)
+        .collect::<Vec<&winternitz::PublicKey>>();
+
+    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.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..983457120
--- /dev/null
+++ b/bridge/src/connectors/connector_d.rs
@@ -0,0 +1,65 @@
+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..0a50d6d06
--- /dev/null
+++ b/bridge/src/connectors/connector_f_1.rs
@@ -0,0 +1,39 @@
+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..99b651e46
--- /dev/null
+++ b/bridge/src/connectors/connector_f_2.rs
@@ -0,0 +1,39 @@
+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 91%
rename from src/bridge/connectors/connector_z.rs
rename to bridge/src/connectors/connector_z.rs
index 8d8663399..14449efc5 100644
--- a/src/bridge/connectors/connector_z.rs
+++ b/bridge/src/connectors/connector_z.rs
@@ -1,12 +1,10 @@
-use crate::{
-    bridge::{constants::NUM_BLOCKS_PER_2_WEEKS, utils::num_blocks_per_network},
-    treepp::script,
-};
+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::{
@@ -66,7 +64,9 @@ impl ConnectorZ {
         .compile()
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorZ {
@@ -92,7 +92,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 73%
rename from src/bridge/connectors/mod.rs
rename to bridge/src/connectors/mod.rs
index ed1afe68e..85043981f 100644
--- a/src/bridge/connectors/mod.rs
+++ b/bridge/src/connectors/mod.rs
@@ -9,4 +9,8 @@ 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/src/bridge/constants.rs b/bridge/src/constants.rs
similarity index 74%
rename from src/bridge/constants.rs
rename to bridge/src/constants.rs
index c40d2a10b..e5769d09d 100644
--- a/src/bridge/constants.rs
+++ b/bridge/src/constants.rs
@@ -10,13 +10,13 @@ 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.
+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 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;
@@ -31,6 +31,8 @@ pub enum DestinationNetwork {
     Ethereum,
     /// Ethereum's testnet network.
     EthereumSepolia,
+    /// Locally hosted network.
+    Local,
 }
 
 impl fmt::Display for DestinationNetwork {
@@ -40,6 +42,7 @@ impl fmt::Display for 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 52%
rename from src/bridge/contexts/depositor.rs
rename to bridge/src/contexts/depositor.rs
index a2d2c41c6..3afff9bd8 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,
@@ -20,32 +15,34 @@ 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 }
+    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: &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 52%
rename from src/bridge/contexts/operator.rs
rename to bridge/src/contexts/operator.rs
index c0e8dd4e0..9d11c5d55 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,
@@ -20,32 +15,34 @@ 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 }
+    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: &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/bridge/src/contexts/verifier.rs b/bridge/src/contexts/verifier.rs
new file mode 100644
index 000000000..5d7fc5f6d
--- /dev/null
+++ b/bridge/src/contexts/verifier.rs
@@ -0,0 +1,48 @@
+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 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/src/bridge/contexts/withdrawer.rs b/bridge/src/contexts/withdrawer.rs
similarity index 58%
rename from src/bridge/contexts/withdrawer.rs
rename to bridge/src/contexts/withdrawer.rs
index dd38abba3..eb35f2b87 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,
@@ -20,32 +15,38 @@ 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 }
+    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 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..1ef4ae2f6
--- /dev/null
+++ b/bridge/src/error.rs
@@ -0,0 +1,83 @@
+use super::commitments::CommitmentMessageId;
+use super::graphs::base::GraphId;
+use super::transactions::{base::BaseTransaction, pre_signed::PreSignedTransaction};
+use bitcoin::{PublicKey, Txid};
+use std::fmt::{self, 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)]
+pub enum TransactionError {
+    AlreadyMined(Txid),
+}
+
+#[derive(Debug)]
+pub enum L2Error {
+    PegOutNotInitiated,
+}
+
+#[derive(Debug)]
+pub enum ValidationError {
+    WitnessMismatch(&'static str, Txid, usize), // str: tx name, txid: the transaction id, usize: tx input index
+    TxValidationFailed(&'static str, Txid, usize), // str: tx name, txid: the transaction id, usize: tx input index
+    NoncesValidationFailed(&'static str, PublicKey, Txid, usize), // str: tx name, pubkey: the public key, txid: the transaction id, usize: tx input index
+}
+
+#[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),
+    Validation(ValidationError),
+    Other(String),
+}
+
+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..1a73a51b6
--- /dev/null
+++ b/bridge/src/graphs/base.rs
@@ -0,0 +1,126 @@
+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
+}
+
+pub async fn get_onchain_txs(
+    client: &AsyncClient,
+    txids: &[Txid],
+) -> Vec<Result<Option<Transaction>, esplora_client::Error>> {
+    join_all(txids.iter().map(|txid| client.get_tx(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/src/bridge/graphs/peg_in.rs b/bridge/src/graphs/peg_in.rs
similarity index 69%
rename from src/bridge/graphs/peg_in.rs
rename to bridge/src/graphs/peg_in.rs
index 5fb5fc318..c4fd091ed 100644
--- a/src/bridge/graphs/peg_in.rs
+++ b/bridge/src/graphs/peg_in.rs
@@ -2,25 +2,26 @@ use bitcoin::{
     hex::{Case::Upper, DisplayHex},
     Network, OutPoint, PublicKey, Transaction, Txid, XOnlyPublicKey,
 };
-use esplora_client::{AsyncClient, Error, TxStatus};
+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 std::collections::HashMap;
 
-use crate::bridge::client::sdk::{
-    query::GraphCliQuery, query_contexts::depositor_signatures::DepositorSignatures,
+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},
-        graphs::base::get_block_height,
         transactions::{
             base::{validate_transaction, verify_public_nonces_for_tx, BaseTransaction, Input},
             peg_in_confirm::PegInConfirmTransaction,
@@ -29,103 +30,55 @@ use super::{
             pre_signed::PreSignedTransaction,
         },
     },
-    base::{broadcast_and_verify, get_tx_statuses, verify_if_not_mined, BaseGraph, GRAPH_VERSION},
+    base::{
+        get_tx_statuses, verify_if_not_mined, BaseGraph, GraphId, GRAPH_VERSION,
+        NUM_REQUIRED_OPERATORS,
+    },
+    peg_out::{PegOutGraph, PegOutId},
 };
 
+#[derive(derive_more::Display)]
 pub enum PegInDepositorStatus {
-    PegInDepositWait,     // peg-in deposit not yet confirmed
+    #[display("Peg-in deposit transaction not confirmed yet. Wait...")]
+    PegInDepositWait, // peg-in deposit not yet confirmed
+    #[display("Peg-in confirm transaction not confirmed yet. Wait...")]
     PegInConfirmWait, // peg-in confirm not yet confirmed, wait for operator to complete peg-in, refund not available yet
+    #[display("Peg-in complete. Done.")]
     PegInConfirmComplete, // peg-in complete
+    #[display("Peg-in timed out. Broadcast refund transaction?")]
     PegInRefundAvailable, // peg-in refund available
+    #[display("Peg-in refund complete, funds reclaimed. Done.")]
     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)]
+#[derive(Debug, PartialEq, derive_more::Display)]
 pub enum PegInVerifierStatus {
-    AwaitingDeposit,     // no action required, wait
-    PendingOurNonces,    // the given verifier needs to submit nonces
-    AwaitingNonces,      // the given verifier submitted nonces, awaiting other verifier's nonces
-    PendingOurSignature, // the given verifier needs to submit signature
+    #[display("Peg-in deposit transaction not confirmed yet. Wait...")]
+    AwaitingDeposit, // no action required, wait
+    #[display("No peg-out graph available yet. Wait...")]
+    AwaitingPegOutCreation, // need operator(s) to come online to create peg-out grah
+    #[display("Nonce required. Share nonce?")]
+    PendingOurNonces(Vec<GraphId>), // the given verifier needs to submit nonces
+    #[display("Awaiting nonces. Wait...")]
+    AwaitingNonces, // the given verifier submitted nonces, awaiting other verifier's nonces
+    #[display("Signature required. Pre-sign transactions?")]
+    PendingOurSignature(Vec<GraphId>), // the given verifier needs to submit signature
+    #[display("Awaiting peg-in confirm signatures. Wait...")]
     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::ReadyToSubmit => {
-                write!(
-                    f,
-                    "Peg-in confirm transaction pre-signed. Broadcast confirm transaction?"
-                )
-            }
-            PegInVerifierStatus::PendingOurNonces => {
-                write!(f, "Nonce required. Share peg-in confirm nonce?")
-            }
-            PegInVerifierStatus::AwaitingNonces => {
-                write!(f, "Awaiting peg-in confirm nonces. Wait...")
-            }
-            PegInVerifierStatus::PendingOurSignature => {
-                write!(
-                    f,
-                    "Signature required. Pre-sign peg-in confirm transaction?"
-                )
-            }
-            PegInVerifierStatus::AwaitingSignatures => {
-                write!(f, "Awaiting peg-in confirm signatures. Wait...")
-            }
-            PegInVerifierStatus::Complete => write!(f, "Peg-in done."),
-        }
-    }
+    #[display("Peg-in confirm transaction pre-signed. Broadcast confirm transaction?")]
+    ReadyToSubmit, // all signatures collected, can now submit
+    #[display("Peg-in done.")]
+    Complete, // peg-in complete
 }
 
+#[derive(derive_more::Display)]
 pub enum PegInOperatorStatus {
-    PegInWait,             // peg-in not yet complete, no action required yet, wait
+    #[display("No action available. Wait...")]
+    PegInWait, // peg-in not yet complete, no action required yet, wait
+    #[display("Peg-in confirm transaction ready. Broadcast peg-in confirm transaction?")]
     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."),
-        }
-    }
+    #[display("Peg-in complete. Done.")]
+    PegInComplete, // peg-in complete
 }
 
 struct PegInConnectors {
@@ -149,16 +102,46 @@ pub struct PegInGraph {
 
     pub depositor_public_key: PublicKey,
     depositor_taproot_public_key: XOnlyPublicKey,
-    depositor_evm_address: String,
+    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 network(&self) -> Network {
+        self.network
+    }
 
-    fn id(&self) -> &String { &self.id }
+    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 {
@@ -203,15 +186,17 @@ impl PegInGraph {
             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: &Vec<PublicKey>,
+        n_of_n_public_keys: &[PublicKey],
         n_of_n_taproot_public_key: &XOnlyPublicKey,
         depositor_evm_address: &str,
         deposit_input: Input,
@@ -228,12 +213,13 @@ impl PegInGraph {
         )
     }
 
+    #[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: &Vec<PublicKey>,
+        n_of_n_public_keys: &[PublicKey],
         n_of_n_taproot_public_key: &XOnlyPublicKey,
         depositor_evm_address: &str,
         deposit_input: Input,
@@ -280,13 +266,14 @@ impl PegInGraph {
             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.clone(),
+            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(),
         }
     }
 
@@ -306,32 +293,6 @@ impl PegInGraph {
         )
     }
 
-    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,
-            &self.connector_z,
-            &secret_nonces[&self.peg_in_confirm_transaction.tx().compute_txid()],
-        );
-    }
-
     pub fn peg_in_confirm_transaction_ref(&self) -> &PegInConfirmTransaction {
         &self.peg_in_confirm_transaction
     }
@@ -339,8 +300,16 @@ impl PegInGraph {
     pub async fn verifier_status(
         &self,
         client: &AsyncClient,
-        verifier: Option<&VerifierContext>,
+        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;
 
@@ -349,34 +318,36 @@ impl PegInGraph {
             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 let Some(verifier_context) = verifier {
-            if !self
-                .peg_in_confirm_transaction
-                .has_nonce_of(verifier_context)
-            {
-                return PegInVerifierStatus::PendingOurNonces;
-            }
+        if !self
+            .peg_in_confirm_transaction
+            .has_nonce_of(verifier_context)
+        {
+            return PegInVerifierStatus::PendingOurNonces(vec![self.id.clone()]);
         }
 
-        if !self.peg_in_confirm_transaction.has_all_nonces() {
+        let has_all_pegin_nonces = self.peg_in_confirm_transaction.has_all_nonces();
+        if !has_all_pegin_nonces {
             return PegInVerifierStatus::AwaitingNonces;
         }
 
-        if let Some(verifier_context) = verifier {
-            if !self
-                .peg_in_confirm_transaction
-                .has_signature_of(verifier_context)
-            {
-                return PegInVerifierStatus::PendingOurSignature;
-            }
+        if !self
+            .peg_in_confirm_transaction
+            .has_signatures_for(verifier_context.verifier_public_key)
+        {
+            return PegInVerifierStatus::PendingOurSignature(vec![self.id.clone()]);
         }
 
-        if !self.peg_in_confirm_transaction.has_all_signatures() {
+        let has_all_pegin_signatures = self.peg_in_confirm_transaction.has_all_signatures();
+        if !has_all_pegin_signatures {
             return PegInVerifierStatus::AwaitingSignatures;
         }
 
@@ -407,10 +378,10 @@ impl PegInGraph {
 
     pub fn interpret_depositor_status(
         &self,
-        peg_in_deposit_status: &Result<TxStatus, Error>,
-        peg_in_confirm_status: &Result<TxStatus, Error>,
-        peg_in_refund_status: &Result<TxStatus, Error>,
-        blockchain_height: u32,
+        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()
@@ -427,7 +398,9 @@ impl PegInGraph {
                 .unwrap()
                 .block_height
                 .is_some_and(|block_height| {
-                    block_height + self.connector_z.num_blocks_timelock_0 <= blockchain_height
+                    blockchain_height.is_ok_and(|height| {
+                        block_height + self.connector_z.num_blocks_timelock_0 <= height
+                    })
                 })
             {
                 if peg_in_refund_status
@@ -453,7 +426,7 @@ impl PegInGraph {
     pub async fn depositor_status(&self, client: &AsyncClient) -> PegInDepositorStatus {
         let tx_statuses = get_tx_statuses(
             client,
-            &vec![
+            &[
                 self.peg_in_deposit_transaction.tx().compute_txid(),
                 self.peg_in_confirm_transaction.tx().compute_txid(),
                 self.peg_in_refund_transaction.tx().compute_txid(),
@@ -466,69 +439,54 @@ impl PegInGraph {
                 // make sure vectors size are the same or will panic
                 _ => unreachable!(),
             };
-        let blockchain_height = get_block_height(client).await;
 
         self.interpret_depositor_status(
             peg_in_deposit_status,
             peg_in_confirm_status,
             peg_in_refund_status,
-            blockchain_height,
+            client.get_height().await,
         )
     }
 
-    // todo: return txid
-    pub async fn deposit(&self, client: &AsyncClient)  -> Txid {
+    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;
-
-        // complete deposit tx
-        let deposit_tx = self.peg_in_deposit_transaction.finalize();
-
-        // broadcast deposit tx
-        broadcast_and_verify(client, &deposit_tx).await;
-
-        txid
+        verify_if_not_mined(client, txid).await?;
+        Ok(self.peg_in_deposit_transaction.finalize())
     }
 
-    pub async fn confirm(&self, client: &AsyncClient) -> Txid {
+    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;
+        verify_if_not_mined(client, 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();
+        let deposit_txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        let deposit_status = client.get_tx_status(&deposit_txid).await;
 
-            // broadcast confirm tx
-            broadcast_and_verify(client, &confirm_tx).await;
-
-            txid
-        } else {
-            panic!("Deposit tx has not been confirmed!");
+        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(&self, client: &AsyncClient) -> Txid {
+    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;
+        verify_if_not_mined(client, 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();
+        let deposit_txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        let deposit_status = client.get_tx_status(&deposit_txid).await;
 
-            // broadcast refund tx
-            broadcast_and_verify(client, &refund_tx).await;
-
-            txid
-        } else {
-            panic!("Deposit tx has not been confirmed!");
+        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)),
         }
     }
 
@@ -536,9 +494,9 @@ impl PegInGraph {
         &self,
         client: &AsyncClient,
     ) -> (
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
+        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())
@@ -559,38 +517,37 @@ impl PegInGraph {
         )
     }
 
-    pub fn validate(&self) -> bool {
-        let mut ret_val = true;
+    pub fn validate(&self) -> Result<(), Error> {
         let peg_in_graph = self.new_for_validation();
-        if !validate_transaction(
+        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_deposit_transaction.name(),
+        )?;
+        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_refund_transaction.name(),
+        )?;
+        validate_transaction(
             self.peg_in_confirm_transaction.tx(),
             peg_in_graph.peg_in_confirm_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
+            self.peg_in_confirm_transaction.name(),
+        )?;
 
-        if !verify_public_nonces_for_tx(&self.peg_in_confirm_transaction) {
-            ret_val = false;
-        }
+        verify_public_nonces_for_tx(&self.peg_in_confirm_transaction)?;
 
-        ret_val
+        Ok(())
     }
 
     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();
     }
 }
 
@@ -647,12 +604,13 @@ fn create_new_connectors(
     }
 }
 
+#[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: &Vec<PublicKey>,
+    n_of_n_public_keys: &[PublicKey],
     n_of_n_taproot_public_key: &XOnlyPublicKey,
     depositor_evm_address: &str,
     deposit_input: Input,
@@ -683,7 +641,7 @@ fn create_graph_without_signing(
         &connectors.connector_0,
         &connectors.connector_z,
         generate_input(peg_in_deposit_transaction.tx(), peg_in_confirm_vout_0),
-        n_of_n_public_keys.clone(),
+        n_of_n_public_keys.to_owned(),
     );
 
     PegInGraph {
@@ -694,13 +652,14 @@ fn create_graph_without_signing(
         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.clone(),
+        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(),
     }
 }
 
diff --git a/bridge/src/graphs/peg_out.rs b/bridge/src/graphs/peg_out.rs
new file mode 100644
index 000000000..50514d5ca
--- /dev/null
+++ b/bridge/src/graphs/peg_out.rs
@@ -0,0 +1,2517 @@
+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};
+
+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,
+            },
+        },
+        base::validate_witness,
+        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::{
+        get_onchain_txs, get_tx_statuses, verify_if_not_mined, BaseGraph, GraphId,
+        CROWDFUNDING_AMOUNT, GRAPH_VERSION,
+    },
+    peg_in::PegInGraph,
+};
+
+pub type PegOutId = GraphId;
+
+#[derive(derive_more::Display)]
+pub enum PegOutWithdrawerStatus {
+    #[display("Peg-out available. Request peg-out?")]
+    PegOutNotStarted, // peg-out transaction not created yet
+    #[display("No action available. Wait...")]
+    PegOutWait, // peg-out not confirmed yet, wait
+    #[display("Peg-out complete. Done.")]
+    PegOutComplete, // peg-out complete
+}
+
+#[derive(derive_more::Display)]
+pub enum PegOutVerifierStatus {
+    #[display("Nonces required. Push nonces for peg-out transactions?")]
+    PegOutPendingNonces, // should push nonces
+    #[display("Awaiting nonces for peg-out transactions. Wait...")]
+    PegOutAwaitingNonces, // should wait for nonces from other verifiers
+    #[display("Signatures required. Push signatures for peg-out transactions?")]
+    PegOutPendingSignatures, // should push signatures
+    #[display("Awaiting signatures for peg-out transactions. Wait...")]
+    PegOutAwaitingSignatures, // should wait for signatures from other verifiers
+    #[display("Peg-out complete, reimbursement succeded. Done.")]
+    PegOutComplete, // peg-out complete
+    #[display("No action available. Wait...")]
+    PegOutWait, // no action required, wait
+    #[display(
+        "Kick-off 1 transaction confirmed, dispute available. Broadcast challenge transaction?"
+    )]
+    PegOutChallengeAvailable, // can call challenge
+    #[display("Start time timed out. Broadcast timeout transaction?")]
+    PegOutStartTimeTimeoutAvailable,
+    #[display("Kick-off 1 timed out. Broadcast timeout transaction?")]
+    PegOutKickOffTimeoutAvailable,
+    #[display("Kick-off 2 transaction confirmed. Broadcast disprove chain transaction?")]
+    PegOutDisproveChainAvailable,
+    #[display("Assert transaction confirmed. Broadcast disprove transaction?")]
+    PegOutDisproveAvailable,
+    #[display("Peg-out complete, reimbursement failed. Done.")]
+    PegOutFailed, // timeouts or disproves executed
+}
+
+#[derive(derive_more::Display)]
+pub enum PegOutOperatorStatus {
+    // TODO: add assert initial and assert final
+    #[display("No action available. Wait...")]
+    PegOutWait,
+    #[display("Peg-out complete, reimbursement succeded. Done.")]
+    PegOutComplete, // peg-out complete
+    #[display("Peg-out complete, reimbursement failed. Done.")]
+    PegOutFailed, // timeouts or disproves executed
+    #[display("Peg-out requested. Create and broadcast peg-out transaction?")]
+    PegOutStartPegOut, // should execute peg-out tx
+    #[display("Peg-out confirmed. Broadcast peg-out-confirm transaction?")]
+    PegOutPegOutConfirmAvailable,
+    #[display("Peg-out-confirm confirmed. Broadcast kick-off 1 transaction?")]
+    PegOutKickOff1Available,
+    #[display("Kick-off confirmed. Broadcast start time transaction?")]
+    PegOutStartTimeAvailable,
+    #[display("Start time confirmed. Broadcast kick-off 2 transaction?")]
+    PegOutKickOff2Available,
+    #[display("Dispute raised. Broadcast initial assert transaction?")]
+    PegOutAssertInitialAvailable,
+    #[display("Dispute raised. Broadcast commit 1 assert transaction?")]
+    PegOutAssertCommit1Available,
+    #[display("Dispute raised. Broadcast commit 2 assert transaction?")]
+    PegOutAssertCommit2Available,
+    #[display("Dispute raised. Broadcast final assert transaction?")]
+    PegOutAssertFinalAvailable,
+    #[display("Dispute timed out, reimbursement available. Broadcast take 1 transaction?")]
+    PegOutTake1Available,
+    #[display("Dispute timed out, reimbursement available. Broadcast take 2 transaction?")]
+    PegOutTake2Available,
+}
+
+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);
+                    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);
+                    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)),
+        }
+    }
+
+    // use this when possible
+    // return both commit1 and commit2, will save time for verifying groth16
+    pub async fn assert_commits(
+        &mut self,
+        client: &AsyncClient,
+        commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+        proof: &RawProof,
+    ) -> Result<(Transaction, Transaction), Error> {
+        verify_if_not_mined(client, self.assert_commit_1_transaction.tx().compute_txid()).await?;
+        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_commit1, witness_for_commit2) =
+                        sign_assert_tx_with_groth16_proof(commitment_secrets, proof);
+                    self.assert_commit_1_transaction
+                        .sign(&self.connector_e_1, witness_for_commit1);
+                    self.assert_commit_2_transaction
+                        .sign(&self.connector_e_2, witness_for_commit2);
+                    Ok((
+                        self.assert_commit_1_transaction.finalize(),
+                        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_commit_1_txid = self.assert_commit_1_transaction.tx().compute_txid();
+        let assert_commit_2_txid = self.assert_commit_2_transaction.tx().compute_txid();
+        let Some(onchain_assert_commit_1_tx) = client
+            .get_tx(&assert_commit_1_txid)
+            .await
+            .map_err(Error::Esplora)?
+        else {
+            return Err(Error::Other(format!(
+                "Esplora failed to retrieve a tx {} with id: {}",
+                self.assert_commit_1_transaction.name(),
+                assert_commit_1_txid
+            )));
+        };
+        let Some(onchain_assert_commit_2_tx) = client
+            .get_tx(&assert_commit_2_txid)
+            .await
+            .map_err(Error::Esplora)?
+        else {
+            return Err(Error::Other(format!(
+                "Esplora failed to retrieve a tx {} with id: {}",
+                self.assert_commit_2_transaction.name(),
+                assert_commit_2_txid
+            )));
+        };
+
+        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(&onchain_assert_commit_1_tx);
+                    let assert_commit_2_witness =
+                        get_commit_from_assert_commit_tx(&onchain_assert_commit_2_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,
+                        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 async fn validate(&self, client: &AsyncClient) -> Result<(), Error> {
+        let peg_out_graph = self.new_for_validation();
+
+        validate_transaction(
+            self.assert_initial_transaction.tx(),
+            peg_out_graph.assert_initial_transaction.tx(),
+            self.assert_initial_transaction.name(),
+        )?;
+        validate_transaction(
+            self.assert_commit_1_transaction.tx(),
+            peg_out_graph.assert_commit_1_transaction.tx(),
+            self.assert_commit_1_transaction.name(),
+        )?;
+        validate_transaction(
+            self.assert_commit_2_transaction.tx(),
+            peg_out_graph.assert_commit_2_transaction.tx(),
+            self.assert_commit_2_transaction.name(),
+        )?;
+        validate_transaction(
+            self.assert_final_transaction.tx(),
+            peg_out_graph.assert_final_transaction.tx(),
+            self.assert_final_transaction.name(),
+        )?;
+        validate_transaction(
+            self.challenge_transaction.tx(),
+            peg_out_graph.challenge_transaction.tx(),
+            self.challenge_transaction.name(),
+        )?;
+        validate_transaction(
+            self.disprove_chain_transaction.tx(),
+            peg_out_graph.disprove_chain_transaction.tx(),
+            self.disprove_chain_transaction.name(),
+        )?;
+        validate_transaction(
+            self.disprove_transaction.tx(),
+            peg_out_graph.disprove_transaction.tx(),
+            self.disprove_transaction.name(),
+        )?;
+        validate_transaction(
+            self.peg_out_confirm_transaction.tx(),
+            peg_out_graph.peg_out_confirm_transaction.tx(),
+            self.peg_out_confirm_transaction.name(),
+        )?;
+        validate_transaction(
+            self.kick_off_1_transaction.tx(),
+            peg_out_graph.kick_off_1_transaction.tx(),
+            self.kick_off_1_transaction.name(),
+        )?;
+        validate_transaction(
+            self.kick_off_2_transaction.tx(),
+            peg_out_graph.kick_off_2_transaction.tx(),
+            self.kick_off_2_transaction.name(),
+        )?;
+        validate_transaction(
+            self.kick_off_timeout_transaction.tx(),
+            peg_out_graph.kick_off_timeout_transaction.tx(),
+            self.kick_off_timeout_transaction.name(),
+        )?;
+        validate_transaction(
+            self.start_time_transaction.tx(),
+            peg_out_graph.start_time_transaction.tx(),
+            self.start_time_transaction.name(),
+        )?;
+        validate_transaction(
+            self.start_time_timeout_transaction.tx(),
+            peg_out_graph.start_time_timeout_transaction.tx(),
+            self.start_time_timeout_transaction.name(),
+        )?;
+        validate_transaction(
+            self.take_1_transaction.tx(),
+            peg_out_graph.take_1_transaction.tx(),
+            self.take_1_transaction.name(),
+        )?;
+        validate_transaction(
+            self.take_2_transaction.tx(),
+            peg_out_graph.take_2_transaction.tx(),
+            self.take_2_transaction.name(),
+        )?;
+
+        let txs_with_commits = vec![
+            (
+                self.assert_commit_1_transaction.tx(),
+                self.assert_commit_1_transaction.name(),
+            ),
+            (
+                self.assert_commit_1_transaction.tx(),
+                self.assert_commit_1_transaction.name(),
+            ),
+            (
+                self.start_time_transaction.tx(),
+                self.start_time_transaction.name(),
+            ),
+            (
+                self.kick_off_2_transaction.tx(),
+                self.kick_off_2_transaction.name(),
+            ),
+            (
+                self.peg_out_confirm_transaction.tx(),
+                self.peg_out_confirm_transaction.name(),
+            ),
+        ];
+
+        let txids: Vec<Txid> = txs_with_commits
+            .iter()
+            .map(|(tx, _)| tx.compute_txid())
+            .collect();
+        let tx_statuses = get_tx_statuses(client, &txids).await;
+        let onchain_txs = get_onchain_txs(client, &txids).await;
+
+        for ((tx, tx_name), (tx_status_res, onchain_tx_res)) in txs_with_commits
+            .iter()
+            .zip(tx_statuses.into_iter().zip(onchain_txs.into_iter()))
+        {
+            validate_witness(tx, &tx_name, tx_status_res, onchain_tx_res)?;
+        }
+
+        verify_public_nonces_for_tx(&self.assert_initial_transaction)?;
+        verify_public_nonces_for_tx(&self.assert_final_transaction)?;
+        verify_public_nonces_for_tx(&self.disprove_chain_transaction)?;
+        verify_public_nonces_for_tx(&self.disprove_transaction)?;
+        verify_public_nonces_for_tx(&self.kick_off_timeout_transaction)?;
+        verify_public_nonces_for_tx(&self.start_time_transaction)?;
+        verify_public_nonces_for_tx(&self.start_time_timeout_transaction)?;
+        verify_public_nonces_for_tx(&self.take_1_transaction)?;
+        verify_public_nonces_for_tx(&self.take_2_transaction)?;
+
+        Ok(())
+    }
+
+    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);
+        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 100%
rename from src/bridge/mod.rs
rename to bridge/src/mod.rs
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 90%
rename from src/bridge/scripts.rs
rename to bridge/src/scripts.rs
index f8358d62b..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, 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)
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..baf867473
--- /dev/null
+++ b/bridge/src/superblock.rs
@@ -0,0 +1,61 @@
+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 87%
rename from src/bridge/transactions/assert.rs
rename to bridge/src/transactions/assert.rs
index 4e3878b8e..267f93295 100644
--- a/src/bridge/transactions/assert.rs
+++ b/bridge/src/transactions/assert.rs
@@ -12,7 +12,7 @@ use super::{
             connector_c::ConnectorC,
         },
         contexts::{base::BaseContext, verifier::VerifierContext},
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT},
+        graphs::base::DUST_AMOUNT,
     },
     base::*,
     pre_signed::*,
@@ -33,17 +33,27 @@ pub struct AssertTransaction {
 }
 
 impl PreSignedTransaction for AssertTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for AssertTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -63,6 +73,9 @@ impl PreSignedMusig2Transaction for AssertTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl AssertTransaction {
@@ -86,23 +99,23 @@ impl AssertTransaction {
         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),
@@ -153,16 +166,6 @@ impl AssertTransaction {
         );
     }
 
-    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,
@@ -180,5 +183,10 @@ impl AssertTransaction {
 }
 
 impl BaseTransaction for AssertTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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..a6854e218
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_commit_1.rs
@@ -0,0 +1,140 @@
+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..3d5066389
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_commit_2.rs
@@ -0,0 +1,141 @@
+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..835db36e7
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_final.rs
@@ -0,0 +1,263 @@
+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..8f124b121
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_initial.rs
@@ -0,0 +1,231 @@
+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..a58a84787
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/utils.rs
@@ -0,0 +1,166 @@
+use bitcoin::hex::DisplayHex;
+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>) {
+    println!("Signing assert tx with groth16 proof ...");
+    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, v.secret_key.to_lower_hex_string()));
+        }
+    });
+
+    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/bridge/src/transactions/base.rs b/bridge/src/transactions/base.rs
new file mode 100644
index 000000000..75d62adb3
--- /dev/null
+++ b/bridge/src/transactions/base.rs
@@ -0,0 +1,444 @@
+use super::pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction};
+use crate::{
+    error::{Error, ValidationError},
+    graphs::base::MIN_RELAY_FEE_RATE,
+};
+use bitcoin::{Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey};
+use core::cmp;
+use esplora_client::TxStatus;
+use itertools::Itertools;
+use musig2::{secp256k1::schnorr::Signature, PubNonce};
+use std::collections::HashMap;
+
+// 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(238785);
+pub const MIN_RELAY_FEE_DISPROVE_CHAIN: u64 = relay_fee(389370);
+
+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,
+    tx_name: &'static str,
+) -> Result<(), Error> {
+    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
+        {
+            return Err(Error::Validation(ValidationError::TxValidationFailed(
+                tx_name,
+                transaction.compute_txid(),
+                i,
+            )));
+        }
+    }
+
+    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
+        {
+            return Err(Error::Validation(ValidationError::TxValidationFailed(
+                tx_name,
+                transaction.compute_txid(),
+                i,
+            )));
+        }
+    }
+
+    Ok(())
+}
+
+pub fn validate_witness(
+    tx: &Transaction,
+    tx_name: &'static str,
+    tx_status_res: Result<TxStatus, esplora_client::Error>,
+    onchain_tx_res: Result<Option<Transaction>, esplora_client::Error>,
+) -> Result<(), Error> {
+    let txid = tx.compute_txid();
+    let tx_status = tx_status_res.map_err(Error::Esplora)?;
+
+    if tx_status.confirmed {
+        let result_tx = onchain_tx_res.map_err(Error::Esplora)?;
+        match result_tx {
+            Some(onchain_tx) => {
+                for i in 0..tx.input.len() {
+                    if !tx.input[i].witness.is_empty()
+                        && tx.input[i].witness != onchain_tx.input[i].witness
+                    {
+                        return Err(Error::Validation(ValidationError::WitnessMismatch(
+                            tx_name, txid, i,
+                        )));
+                    }
+                }
+                Ok(())
+            }
+            None => Err(Error::Other(format!(
+                "Esplora failed to retrieve a confirmed tx with id: {}",
+                txid
+            ))),
+        }
+    } else {
+        Ok(())
+    }
+}
+
+fn verify_public_nonces(
+    all_nonces: &HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    all_sigs: &HashMap<usize, HashMap<PublicKey, Signature>>,
+    txid: Txid,
+    tx_name: &'static str,
+) -> Result<(), Error> {
+    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}."
+                );
+                return Err(Error::Validation(ValidationError::NoncesValidationFailed(
+                    tx_name, *pubkey, txid, *i,
+                )));
+            }
+        }
+    }
+
+    Ok(())
+}
+
+pub fn verify_public_nonces_for_tx(
+    tx: &(impl BaseTransaction + PreSignedMusig2Transaction),
+) -> Result<(), Error> {
+    verify_public_nonces(
+        tx.musig2_nonces(),
+        tx.musig2_nonce_signatures(),
+        tx.tx().compute_txid(),
+        tx.name(),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{collections::HashMap, str::FromStr};
+
+    use bitcoin::{
+        absolute,
+        hex::DisplayHex,
+        key::{
+            constants::{SCHNORR_SIGNATURE_SIZE, SECRET_KEY_SIZE},
+            Keypair,
+        },
+        Amount, OutPoint, PublicKey, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Txid, Witness,
+    };
+    use esplora_client::TxStatus;
+    use musig2::{secp256k1::schnorr::Signature, PubNonce};
+
+    use crate::{
+        contexts::base::generate_keys_from_secret,
+        error::{Error, ValidationError},
+        transactions::{pre_signed_musig2::get_nonce_message, signing_musig2::generate_nonce},
+    };
+
+    use super::{validate_witness, 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,
+                &[(signer + 1) as u8; SECRET_KEY_SIZE].to_lower_hex_string(),
+            );
+            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)
+    }
+
+    fn get_test_tx() -> Transaction {
+        Transaction {
+            version: bitcoin::transaction::Version(2),
+            lock_time: absolute::LockTime::ZERO,
+            input: vec![TxIn {
+                previous_output: OutPoint {
+                    txid: Txid::from_str(
+                        "0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327",
+                    )
+                    .unwrap(),
+                    vout: 0,
+                },
+                script_sig: ScriptBuf::new(),
+                sequence: Sequence::MAX,
+                witness: Witness::default(),
+            }],
+            output: vec![TxOut {
+                script_pubkey: ScriptBuf::new(),
+                value: Amount::from_sat(0),
+            }],
+        }
+    }
+
+    #[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(),
+                "test_tx"
+            )
+            .is_ok(),
+            "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());
+
+        let result = verify_public_nonces(
+            &all_nonces,
+            &all_sigs,
+            DUMMY_TXID.parse::<Txid>().unwrap(),
+            "test_tx",
+        );
+
+        assert!(matches!(
+            result,
+            Err(Error::Validation(ValidationError::NoncesValidationFailed(
+                _,
+                _,
+                _,
+                _
+            )))
+        ));
+
+        if let Err(Error::Validation(ValidationError::NoncesValidationFailed(
+            tx_name,
+            _pubkey,
+            _txid,
+            _input_index,
+        ))) = result
+        {
+            assert_eq!(tx_name, "test_tx");
+            assert_eq!(_pubkey, pubkey);
+            assert_eq!(_txid, DUMMY_TXID.parse::<Txid>().unwrap());
+            assert_eq!(input_index, input_index);
+        }
+    }
+
+    #[test]
+    fn test_verify_witness_mismatch() {
+        let mut tx = get_test_tx();
+        tx.input[0].witness = vec![vec![0u8; 32]].into();
+
+        let onchain_tx_res = Ok(Some(get_test_tx()));
+        let tx_status_res = Ok(TxStatus {
+            confirmed: true,
+            block_height: None,
+            block_hash: None,
+            block_time: None,
+        });
+        let result = validate_witness(&tx, "test_tx", tx_status_res, onchain_tx_res);
+
+        assert!(matches!(
+            result,
+            Err(Error::Validation(ValidationError::WitnessMismatch(_, _, _)))
+        ));
+
+        if let Err(Error::Validation(ValidationError::WitnessMismatch(
+            tx_name,
+            txid,
+            input_index,
+        ))) = result
+        {
+            assert_eq!(tx_name, "test_tx");
+            assert_eq!(txid, tx.compute_txid());
+            assert_eq!(input_index, 0);
+        }
+    }
+
+    #[test]
+    fn test_verify_witness_match() {
+        let mut tx = get_test_tx();
+        tx.input[0].witness = vec![vec![0u8; 32]].into();
+
+        let onchain_tx_res = Ok(Some(tx.clone()));
+        let tx_status_res = Ok(TxStatus {
+            confirmed: true,
+            block_height: None,
+            block_hash: None,
+            block_time: None,
+        });
+        let result = validate_witness(&tx, "test_tx", tx_status_res, onchain_tx_res);
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn test_verify_empty_witness_and_not_empty_onchain_witness() {
+        let tx = get_test_tx();
+        let mut onchain_tx = tx.clone();
+        onchain_tx.input[0].witness = vec![vec![0u8; 32]].into();
+
+        let onchain_tx_res = Ok(Some(onchain_tx));
+        let tx_status_res = Ok(TxStatus {
+            confirmed: true,
+            block_height: None,
+            block_hash: None,
+            block_time: None,
+        });
+        let result = validate_witness(&tx, "test_tx", tx_status_res, onchain_tx_res);
+
+        assert!(result.is_ok());
+    }
+}
diff --git a/src/bridge/transactions/challenge.rs b/bridge/src/transactions/challenge.rs
similarity index 76%
rename from src/bridge/transactions/challenge.rs
rename to bridge/src/transactions/challenge.rs
index 82d0ee2f3..3983570a3 100644
--- a/src/bridge/transactions/challenge.rs
+++ b/bridge/src/transactions/challenge.rs
@@ -3,14 +3,12 @@ use bitcoin::{
     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::{base::*, 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,
@@ -27,13 +25,21 @@ pub struct ChallengeTransaction {
 }
 
 impl PreSignedTransaction for ChallengeTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl ChallengeTransaction {
@@ -67,7 +73,7 @@ impl ChallengeTransaction {
         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,
@@ -100,7 +106,6 @@ impl ChallengeTransaction {
     fn sign_input_0(&mut self, context: &OperatorContext, connector_a: &ConnectorA) {
         pre_sign_taproot_input_default(
             self,
-            context,
             0,
             TapSighashType::SinglePlusAnyoneCanPay,
             connector_a.generate_taproot_spend_info(),
@@ -111,7 +116,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,
@@ -125,15 +129,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
@@ -150,7 +160,6 @@ impl ChallengeTransaction {
 
             // add witness
             populate_p2wsh_witness(
-                context,
                 &mut self.tx,
                 input_index,
                 sighash_type,
@@ -166,6 +175,10 @@ 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 {
@@ -176,4 +189,7 @@ 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 76%
rename from src/bridge/transactions/disprove.rs
rename to bridge/src/transactions/disprove.rs
index c9394d468..965310bce 100644
--- a/src/bridge/transactions/disprove.rs
+++ b/bridge/src/transactions/disprove.rs
@@ -1,6 +1,7 @@
 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;
@@ -9,13 +10,12 @@ use super::{
     super::{
         connectors::{base::*, 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::push_taproot_leaf_script_and_control_block_to_witness,
+    signing::push_taproot_leaf_script_and_cached_control_block_to_witness,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -33,17 +33,27 @@ pub struct DisproveTransaction {
 }
 
 impl PreSignedTransaction for DisproveTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for DisproveTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -63,6 +73,9 @@ impl PreSignedMusig2Transaction for DisproveTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl DisproveTransaction {
@@ -72,16 +85,8 @@ impl DisproveTransaction {
         connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
-        script_index: u32,
     ) -> Self {
-        Self::new_for_validation(
-            context.network,
-            connector_5,
-            connector_c,
-            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(
@@ -90,22 +95,22 @@ impl DisproveTransaction {
         connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
-        script_index: u32,
     ) -> Self {
         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(),
@@ -130,7 +135,7 @@ 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
             ],
             reward_output_amount,
             musig2_nonces: HashMap::new(),
@@ -171,16 +176,6 @@ impl DisproveTransaction {
         );
     }
 
-    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,
@@ -194,7 +189,8 @@ impl DisproveTransaction {
     pub fn add_input_output(
         &mut self,
         connector_c: &ConnectorC,
-        input_script_index: u32,
+        input_script_index: usize,
+        input_script_witness: RawWitness,
         output_script_pubkey: ScriptBuf,
     ) {
         // Add output
@@ -204,16 +200,17 @@ impl DisproveTransaction {
         let input_index = 1;
 
         // Push the unlocking witness
-        let unlock_witness = 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 = 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(
+        let (script, control_block) =
+            connector_c.taproot_script_and_control_block(input_script_index);
+        push_taproot_leaf_script_and_cached_control_block_to_witness(
             &mut self.tx,
             input_index,
-            &taproot_spend_info,
+            &control_block,
             &script,
         );
     }
@@ -232,4 +229,7 @@ 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 72%
rename from src/bridge/transactions/disprove_chain.rs
rename to bridge/src/transactions/disprove_chain.rs
index 08deeea2e..bffc59831 100644
--- a/src/bridge/transactions/disprove_chain.rs
+++ b/bridge/src/transactions/disprove_chain.rs
@@ -1,20 +1,23 @@
 use bitcoin::{
-    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+    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::{base::*, 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)]
@@ -32,17 +35,27 @@ pub struct DisproveChainTransaction {
 }
 
 impl PreSignedTransaction for DisproveChainTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for DisproveChainTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -62,6 +75,9 @@ impl PreSignedMusig2Transaction for DisproveChainTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl DisproveChainTransaction {
@@ -73,14 +89,15 @@ impl DisproveChainTransaction {
         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(),
@@ -137,16 +154,6 @@ impl DisproveChainTransaction {
         );
     }
 
-    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,
@@ -155,6 +162,32 @@ impl DisproveChainTransaction {
     ) {
         let input_index = 0;
         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) {
@@ -176,4 +209,7 @@ impl BaseTransaction for DisproveChainTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str {
+        "DisproveChain"
+    }
 }
diff --git a/src/bridge/transactions/kick_off_1.rs b/bridge/src/transactions/kick_off_1.rs
similarity index 84%
rename from src/bridge/transactions/kick_off_1.rs
rename to bridge/src/transactions/kick_off_1.rs
index 26152d41d..c37d5a603 100644
--- a/src/bridge/transactions/kick_off_1.rs
+++ b/bridge/src/transactions/kick_off_1.rs
@@ -11,13 +11,13 @@ use super::{
             connector_a::ConnectorA,
         },
         contexts::operator::OperatorContext,
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT, MESSAGE_COMMITMENT_FEE_AMOUNT},
+        graphs::base::DUST_AMOUNT,
     },
     base::*,
     pre_signed::*,
     signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
-    signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs},
 };
+use bitvm::signatures::signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs};
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct KickOff1Transaction {
@@ -29,13 +29,21 @@ pub struct KickOff1Transaction {
 }
 
 impl PreSignedTransaction for KickOff1Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl KickOff1Transaction {
@@ -46,8 +54,6 @@ impl KickOff1Transaction {
         connector_6: &Connector6,
         input_0: Input,
     ) -> Self {
-        
-
         Self::new_for_validation(
             context.network,
             &context.operator_taproot_public_key,
@@ -77,24 +83,24 @@ impl KickOff1Transaction {
         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(MESSAGE_COMMITMENT_FEE_AMOUNT * 2 + FEE_AMOUNT);
+        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(),
         };
 
-        let _output_1 = TxOut {
-            value: total_output_amount - Amount::from_sat(DUST_AMOUNT) * 2,
-            script_pubkey: connector_1.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),
+            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),
@@ -125,7 +131,6 @@ impl KickOff1Transaction {
 
         // get schnorr signature
         let schnorr_signature = generate_taproot_leaf_schnorr_signature(
-            context,
             self.tx_mut(),
             prev_outs,
             input_index,
@@ -167,5 +172,10 @@ impl KickOff1Transaction {
 }
 
 impl BaseTransaction for KickOff1Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "KickOff1"
+    }
 }
diff --git a/src/bridge/transactions/kick_off_2.rs b/bridge/src/transactions/kick_off_2.rs
similarity index 75%
rename from src/bridge/transactions/kick_off_2.rs
rename to bridge/src/transactions/kick_off_2.rs
index 3df887167..c161f994f 100644
--- a/src/bridge/transactions/kick_off_2.rs
+++ b/bridge/src/transactions/kick_off_2.rs
@@ -1,10 +1,10 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
+    Witness,
 };
 use serde::{Deserialize, Serialize};
 
-use crate::bridge::connectors::base::{P2wshConnector, TaprootConnector};
+use crate::connectors::base::{P2wshConnector, TaprootConnector};
 
 use super::{
     super::{
@@ -15,10 +15,11 @@ use super::{
     base::*,
     pre_signed::*,
     signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
-    signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs},
 };
 
-const MIN_RELAY_FEE_AMOUNT: u64 = 105_771;
+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 {
@@ -27,25 +28,40 @@ pub struct KickOff2Transaction {
     #[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(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl KickOff2Transaction {
-    pub fn new(context: &OperatorContext, connector_1: &Connector1, input_0: Input) -> Self {
+    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,
-            &context.n_of_n_taproot_public_key,
             connector_1,
+            connector_b,
             input_0,
         )
     }
@@ -53,17 +69,16 @@ impl KickOff2Transaction {
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
         connector_1: &Connector1,
+        connector_b: &ConnectorB,
         input_0: Input,
     ) -> Self {
         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(MIN_RELAY_FEE_AMOUNT);
+        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),
@@ -71,7 +86,7 @@ impl KickOff2Transaction {
         };
 
         let _output_1 = TxOut {
-            value: total_output_amount - Amount::from_sat(DUST_AMOUNT),
+            value: total_output_amount - _output_0.value,
             script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
         };
 
@@ -87,6 +102,7 @@ impl KickOff2Transaction {
                 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,
         }
     }
 
@@ -104,7 +120,6 @@ impl KickOff2Transaction {
         let mut unlock_data: Vec<Vec<u8>> = Vec::new();
 
         let schnorr_signature = generate_taproot_leaf_schnorr_signature(
-            context,
             self.tx_mut(),
             prev_outs,
             input_index,
@@ -113,8 +128,12 @@ impl KickOff2Transaction {
             &context.operator_keypair,
         );
         unlock_data.push(schnorr_signature.to_vec());
+
         unlock_data.extend(generate_winternitz_witness(superblock_signing_inputs).to_vec());
-        unlock_data.extend(generate_winternitz_witness(superblock_hash_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(),
@@ -142,5 +161,10 @@ impl KickOff2Transaction {
 }
 
 impl BaseTransaction for KickOff2Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 89%
rename from src/bridge/transactions/kick_off_timeout.rs
rename to bridge/src/transactions/kick_off_timeout.rs
index 0b5de68c3..7b345b841 100644
--- a/src/bridge/transactions/kick_off_timeout.rs
+++ b/bridge/src/transactions/kick_off_timeout.rs
@@ -9,7 +9,6 @@ use super::{
     super::{
         connectors::{base::*, connector_1::Connector1},
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -32,17 +31,27 @@ pub struct KickOffTimeoutTransaction {
 }
 
 impl PreSignedTransaction for KickOffTimeoutTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for KickOffTimeoutTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -62,6 +71,9 @@ impl PreSignedMusig2Transaction for KickOffTimeoutTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl KickOffTimeoutTransaction {
@@ -73,7 +85,7 @@ impl KickOffTimeoutTransaction {
         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,
@@ -137,16 +149,6 @@ impl KickOffTimeoutTransaction {
         );
     }
 
-    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,
@@ -176,4 +178,7 @@ 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 93%
rename from src/bridge/transactions/mod.rs
rename to bridge/src/transactions/mod.rs
index b5e55899f..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;
@@ -15,7 +16,6 @@ pub mod pre_signed;
 pub mod pre_signed_musig2;
 pub mod signing;
 pub mod signing_musig2;
-pub mod signing_winternitz;
 pub mod start_time;
 pub mod start_time_timeout;
 pub mod take_1;
diff --git a/src/bridge/transactions/peg_in_confirm.rs b/bridge/src/transactions/peg_in_confirm.rs
similarity index 89%
rename from src/bridge/transactions/peg_in_confirm.rs
rename to bridge/src/transactions/peg_in_confirm.rs
index 478907d39..b44129e18 100644
--- a/src/bridge/transactions/peg_in_confirm.rs
+++ b/bridge/src/transactions/peg_in_confirm.rs
@@ -9,7 +9,6 @@ use super::{
     super::{
         connectors::{base::*, connector_0::Connector0, connector_z::ConnectorZ},
         contexts::{base::BaseContext, depositor::DepositorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
     },
     base::*,
     pre_signed::*,
@@ -17,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>")]
@@ -33,17 +34,27 @@ pub struct PegInConfirmTransaction {
 }
 
 impl PreSignedTransaction for PegInConfirmTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for PegInConfirmTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -63,6 +74,9 @@ impl PreSignedMusig2Transaction for PegInConfirmTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl PegInConfirmTransaction {
@@ -88,14 +102,14 @@ impl PegInConfirmTransaction {
         connector_0: &Connector0,
         connector_z: &ConnectorZ,
         input_0: Input,
-        n_of_n_public_keys: &Vec<PublicKey>,
+        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.clone(),
+            n_of_n_public_keys.to_owned(),
         );
 
         this.push_depositor_signature_input(0, depositor_signature);
@@ -112,7 +126,7 @@ impl PegInConfirmTransaction {
         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,
@@ -141,7 +155,6 @@ impl PegInConfirmTransaction {
     fn generate_and_push_depositor_signature_input_0(&mut self, context: &DepositorContext) {
         let input_index = 0;
         let schnorr_signature = generate_taproot_leaf_schnorr_signature(
-            context,
             &mut self.tx,
             &self.prev_outs,
             input_index,
@@ -158,9 +171,7 @@ impl PegInConfirmTransaction {
         input_index: usize,
         signature: bitcoin::taproot::Signature,
     ) {
-        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
-
-        unlock_data.push(signature.to_vec());
+        let unlock_data: Vec<Vec<u8>> = vec![signature.to_vec()];
 
         push_taproot_leaf_unlock_data_to_witness(&mut self.tx, input_index, unlock_data);
     }
@@ -197,16 +208,6 @@ impl PegInConfirmTransaction {
         );
     }
 
-    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,
@@ -253,5 +254,10 @@ impl PegInConfirmTransaction {
 }
 
 impl BaseTransaction for PegInConfirmTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 84%
rename from src/bridge/transactions/peg_in_deposit.rs
rename to bridge/src/transactions/peg_in_deposit.rs
index 9aff08055..8c874cb8d 100644
--- a/src/bridge/transactions/peg_in_deposit.rs
+++ b/bridge/src/transactions/peg_in_deposit.rs
@@ -1,6 +1,7 @@
 use bitcoin::{
-    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction,
-    TxOut,
+    absolute,
+    consensus::{self},
+    Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction, TxOut,
 };
 use serde::{Deserialize, Serialize};
 
@@ -8,7 +9,6 @@ use super::{
     super::{
         connectors::{base::*, connector_z::ConnectorZ},
         contexts::depositor::DepositorContext,
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -26,13 +26,21 @@ pub struct PegInDepositTransaction {
 }
 
 impl PreSignedTransaction for PegInDepositTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegInDepositTransaction {
@@ -72,7 +80,7 @@ impl PegInDepositTransaction {
     ) -> 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,
@@ -99,7 +107,6 @@ impl PegInDepositTransaction {
         let input_index = 0;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.depositor_keypair],
@@ -119,5 +126,10 @@ impl PegInDepositTransaction {
 }
 
 impl BaseTransaction for PegInDepositTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 88%
rename from src/bridge/transactions/peg_in_refund.rs
rename to bridge/src/transactions/peg_in_refund.rs
index 53f3e059e..59c20e68e 100644
--- a/src/bridge/transactions/peg_in_refund.rs
+++ b/bridge/src/transactions/peg_in_refund.rs
@@ -7,7 +7,6 @@ use super::{
     super::{
         connectors::{base::*, connector_z::ConnectorZ},
         contexts::depositor::DepositorContext,
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -25,13 +24,21 @@ pub struct PegInRefundTransaction {
 }
 
 impl PreSignedTransaction for PegInRefundTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegInRefundTransaction {
@@ -72,7 +79,7 @@ impl PegInRefundTransaction {
         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,
@@ -98,7 +105,6 @@ impl PegInRefundTransaction {
     fn sign_input_0(&mut self, context: &DepositorContext, connector_z: &ConnectorZ) {
         pre_sign_taproot_input_default(
             self,
-            context,
             0,
             TapSighashType::All,
             connector_z.generate_taproot_spend_info(),
@@ -120,11 +126,16 @@ impl PegInRefundTransaction {
             input_index,
             &taproot_spend_info,
             script,
-            &vec![signature],
+            &[signature],
         );
     }
 }
 
 impl BaseTransaction for PegInRefundTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 83%
rename from src/bridge/transactions/peg_out.rs
rename to bridge/src/transactions/peg_out.rs
index bc3100d7d..a134b436b 100644
--- a/src/bridge/transactions/peg_out.rs
+++ b/bridge/src/transactions/peg_out.rs
@@ -4,10 +4,10 @@ use bitcoin::{
 };
 use serde::{Deserialize, Serialize};
 
-use crate::bridge::client::chain::chain::PegOutEvent;
+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::*,
 };
@@ -22,13 +22,21 @@ pub struct PegOutTransaction {
 }
 
 impl PreSignedTransaction for PegOutTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegOutTransaction {
@@ -58,7 +66,7 @@ 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,
@@ -91,7 +99,6 @@ impl PegOutTransaction {
         let input_index = 0;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
@@ -100,5 +107,10 @@ impl PegOutTransaction {
 }
 
 impl BaseTransaction for PegOutTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegOut"
+    }
 }
diff --git a/src/bridge/transactions/peg_out_confirm.rs b/bridge/src/transactions/peg_out_confirm.rs
similarity index 84%
rename from src/bridge/transactions/peg_out_confirm.rs
rename to bridge/src/transactions/peg_out_confirm.rs
index 4a1133eb1..3d494154e 100644
--- a/src/bridge/transactions/peg_out_confirm.rs
+++ b/bridge/src/transactions/peg_out_confirm.rs
@@ -8,7 +8,6 @@ use super::{
     super::{
         connectors::{base::*, connector_6::Connector6},
         contexts::operator::OperatorContext,
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -25,13 +24,21 @@ pub struct PegOutConfirmTransaction {
 }
 
 impl PreSignedTransaction for PegOutConfirmTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegOutConfirmTransaction {
@@ -56,7 +63,7 @@ impl PegOutConfirmTransaction {
     ) -> 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_OUT_CONFIRM);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -83,7 +90,6 @@ impl PegOutConfirmTransaction {
         let input_index = 0;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
@@ -92,5 +98,10 @@ impl PegOutConfirmTransaction {
 }
 
 impl BaseTransaction for PegOutConfirmTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 95%
rename from src/bridge/transactions/pre_signed.rs
rename to bridge/src/transactions/pre_signed.rs
index c468b4304..3a919f010 100644
--- a/src/bridge/transactions/pre_signed.rs
+++ b/bridge/src/transactions/pre_signed.rs
@@ -19,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>,
@@ -28,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,
@@ -61,7 +59,6 @@ pub fn pre_sign_p2wpkh_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,
@@ -71,7 +68,6 @@ pub fn pre_sign_taproot_input_default<T: PreSignedTransaction>(
     let script = &tx.prev_scripts()[input_index].clone();
 
     populate_taproot_input_witness_default(
-        context,
         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 58%
rename from src/bridge/transactions/pre_signed_musig2.rs
rename to bridge/src/transactions/pre_signed_musig2.rs
index 8fdf3d941..ce99b8402 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,53 +30,78 @@ 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}");
+            eprintln!("Signature::verify() failed with: {e}");
             false
         }
     }
@@ -95,9 +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().cloned()
-        .collect();
+    let musig2_nonces = &tx.musig2_nonces()[&input_index].values().cloned().collect();
 
     let partial_signature = generate_taproot_partial_signature(
         context,
@@ -134,9 +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().cloned()
-        .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/src/bridge/transactions/signing.rs b/bridge/src/transactions/signing.rs
similarity index 69%
rename from src/bridge/transactions/signing.rs
rename to bridge/src/transactions/signing.rs
index 9a7b545f5..b3158ea89 100644
--- a/src/bridge/transactions/signing.rs
+++ b/bridge/src/transactions/signing.rs
@@ -1,16 +1,16 @@
 use bitcoin::{
-    key::Keypair,
+    key::{Keypair, TapTweak},
     secp256k1::Message,
     sighash::{Prevouts, SighashCache},
-    taproot::{LeafVersion, TaprootSpendInfo},
-    Amount, EcdsaSighashType, PublicKey, Script, ScriptBuf, TapLeafHash, TapSighashType,
-    Transaction, TxOut,
+    taproot::{ControlBlock, 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(
-    context: &dyn BaseContext,
     tx: &mut Transaction,
     input_index: usize,
     sighash_type: EcdsaSighashType,
@@ -24,9 +24,7 @@ pub fn generate_p2wsh_schnorr_signature(
         .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());
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
 
     bitcoin::ecdsa::Signature {
         signature,
@@ -35,7 +33,6 @@ pub fn generate_p2wsh_schnorr_signature(
 }
 
 pub fn push_p2wsh_signature_to_witness(
-    context: &dyn BaseContext,
     tx: &mut Transaction,
     input_index: usize,
     sighash_type: EcdsaSighashType,
@@ -43,15 +40,8 @@ pub fn push_p2wsh_signature_to_witness(
     value: Amount,
     keypair: &Keypair,
 ) {
-    let signature = generate_p2wsh_schnorr_signature(
-        context,
-        tx,
-        input_index,
-        sighash_type,
-        script,
-        value,
-        keypair,
-    );
+    let signature =
+        generate_p2wsh_schnorr_signature(tx, input_index, sighash_type, script, value, keypair);
 
     tx.input[input_index]
         .witness
@@ -63,7 +53,6 @@ pub fn push_p2wsh_script_to_witness(tx: &mut Transaction, input_index: usize, sc
 }
 
 pub fn populate_p2wsh_witness(
-    context: &dyn BaseContext,
     tx: &mut Transaction,
     input_index: usize,
     sighash_type: EcdsaSighashType,
@@ -72,15 +61,7 @@ pub fn populate_p2wsh_witness(
     keypairs: &Vec<&Keypair>,
 ) {
     for keypair in keypairs {
-        push_p2wsh_signature_to_witness(
-            context,
-            tx,
-            input_index,
-            sighash_type,
-            script,
-            value,
-            keypair,
-        );
+        push_p2wsh_signature_to_witness(tx, input_index, sighash_type, script, value, keypair);
     }
     push_p2wsh_script_to_witness(tx, input_index, script);
 }
@@ -119,9 +100,7 @@ pub fn generate_p2wpkh_schnorr_signature(
         )
         .expect("Failed to construct sighash");
 
-    let signature = context
-        .secp()
-        .sign_ecdsa(&Message::from(sighash), &keypair.secret_key());
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
 
     bitcoin::ecdsa::Signature {
         signature,
@@ -183,9 +162,8 @@ pub fn populate_p2wpkh_witness(
 }
 
 pub fn generate_taproot_leaf_schnorr_signature(
-    context: &dyn BaseContext,
     tx: &mut Transaction,
-    prev_outs: &Vec<TxOut>,
+    prev_outs: &[TxOut],
     input_index: usize,
     sighash_type: TapSighashType,
     script: &Script,
@@ -193,33 +171,32 @@ pub fn generate_taproot_leaf_schnorr_signature(
 ) -> bitcoin::taproot::Signature {
     let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
 
-    let sighash;
-    if sighash_type == TapSighashType::AllPlusAnyoneCanPay
+    let sighash = if sighash_type == TapSighashType::AllPlusAnyoneCanPay
         || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
         || sighash_type == TapSighashType::NonePlusAnyoneCanPay
     {
-        sighash = SighashCache::new(tx)
+        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");
+            .expect("Failed to construct sighash")
     } else {
-        sighash = SighashCache::new(tx)
+        SighashCache::new(tx)
             .taproot_script_spend_signature_hash(
                 input_index,
                 &Prevouts::All(prev_outs),
                 leaf_hash,
                 sighash_type,
             )
-            .expect("Failed to construct sighash");
-    }
+            .expect("Failed to construct sighash")
+    };
 
-    let signature = context
-        .secp()
-        .sign_schnorr_no_aux_rand(&Message::from(sighash), keypair);
+    // 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,
@@ -262,6 +239,23 @@ pub fn push_taproot_leaf_script_and_control_block_to_witness(
         .push(control_block.serialize());
 }
 
+pub fn push_taproot_leaf_script_and_cached_control_block_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    control_block: &ControlBlock,
+    script: &Script,
+) {
+    let prevout_leaf = (ScriptBuf::from(script), LeafVersion::TapScript);
+
+    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(
@@ -282,10 +276,10 @@ pub fn populate_taproot_input_witness(
 
 /// 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(
-    context: &dyn BaseContext,
     tx: &mut Transaction,
-    prevouts: &Vec<TxOut>,
+    prevouts: &[TxOut],
     input_index: usize,
     sighash_type: TapSighashType,
     taproot_spend_info: &TaprootSpendInfo,
@@ -295,7 +289,6 @@ pub fn populate_taproot_input_witness_default(
     let mut unlock_data: Vec<Vec<u8>> = Vec::new();
     for keypair in keypairs {
         let schnorr_signature = generate_taproot_leaf_schnorr_signature(
-            context,
             tx,
             prevouts,
             input_index,
@@ -320,8 +313,65 @@ pub fn populate_taproot_input_witness_with_signature(
     input_index: usize,
     taproot_spend_info: &TaprootSpendInfo,
     script: &Script,
-    signatures: &Vec<bitcoin::taproot::Signature>,
+    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 93%
rename from src/bridge/transactions/signing_musig2.rs
rename to bridge/src/transactions/signing_musig2.rs
index 1d7931259..0fd113d94 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,
@@ -12,9 +13,13 @@ use musig2::{
 
 use super::super::contexts::{base::BaseContext, verifier::VerifierContext};
 
-pub fn generate_nonce() -> SecNonce { SecNonce::build(&mut rand::rngs::OsRng).build() }
+pub fn generate_nonce() -> SecNonce {
+    SecNonce::build(&mut rand::rngs::OsRng).build()
+}
 
-pub fn generate_aggregated_nonce(nonces: &Vec<PubNonce>) -> AggNonce { AggNonce::sum(nonces) }
+pub fn generate_aggregated_nonce(nonces: &Vec<PubNonce>) -> AggNonce {
+    AggNonce::sum(nonces)
+}
 
 pub fn generate_taproot_partial_signature(
     context: &VerifierContext,
@@ -22,7 +27,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> {
@@ -58,7 +63,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>,
diff --git a/src/bridge/transactions/start_time.rs b/bridge/src/transactions/start_time.rs
similarity index 82%
rename from src/bridge/transactions/start_time.rs
rename to bridge/src/transactions/start_time.rs
index 0598611b1..a87dd667d 100644
--- a/src/bridge/transactions/start_time.rs
+++ b/bridge/src/transactions/start_time.rs
@@ -1,19 +1,23 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+    Witness,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-use crate::bridge::connectors::{base::TaprootConnector, connector_2::Connector2};
+use crate::connectors::{base::TaprootConnector, connector_2::Connector2};
 
 use super::{
-    super::{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},
-    signing_winternitz::{generate_winternitz_witness, WinternitzSecret, WinternitzSigningInputs},
+};
+
+use bitvm::signatures::signing_winternitz::{
+    generate_winternitz_witness, WinternitzSecret, WinternitzSigningInputs,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -24,23 +28,35 @@ pub struct StartTimeTransaction {
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
 
+    pub start_time_witness: Option<Witness>,
+
     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 StartTimeTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for StartTimeTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -60,12 +76,13 @@ 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, connector_2: &Connector2, input_0: Input) -> Self {
-        
-
         Self::new_for_validation(
             context.network,
             &context.operator_public_key,
@@ -83,7 +100,7 @@ impl StartTimeTransaction {
         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,
@@ -103,6 +120,7 @@ impl StartTimeTransaction {
                 script_pubkey: connector_2.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_2.generate_taproot_leaf_script(input_0_leaf)],
+            start_time_witness: None,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
@@ -123,7 +141,6 @@ impl StartTimeTransaction {
 
         // get schnorr signature
         let schnorr_signature = generate_taproot_leaf_schnorr_signature(
-            context,
             self.tx_mut(),
             prev_outs,
             input_index,
@@ -134,7 +151,8 @@ impl StartTimeTransaction {
         unlock_data.push(schnorr_signature.to_vec());
 
         // get winternitz signature
-        unlock_data.extend(generate_winternitz_witness(start_time_signing_inputs).to_vec());
+        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(),
@@ -171,5 +189,10 @@ impl StartTimeTransaction {
 }
 
 impl BaseTransaction for StartTimeTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 87%
rename from src/bridge/transactions/start_time_timeout.rs
rename to bridge/src/transactions/start_time_timeout.rs
index f0a60e041..d77041bd2 100644
--- a/src/bridge/transactions/start_time_timeout.rs
+++ b/bridge/src/transactions/start_time_timeout.rs
@@ -9,7 +9,6 @@ use super::{
     super::{
         connectors::{base::*, connector_1::Connector1, connector_2::Connector2},
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -32,17 +31,27 @@ pub struct StartTimeTimeoutTransaction {
 }
 
 impl PreSignedTransaction for StartTimeTimeoutTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for StartTimeTimeoutTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -62,6 +71,9 @@ 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 {
@@ -72,13 +84,7 @@ impl StartTimeTimeoutTransaction {
         input_0: Input,
         input_1: Input,
     ) -> Self {
-        Self::new_for_validation(
-            context.network,
-            connector_1,
-            connector_2,
-            input_0,
-            input_1,
-        )
+        Self::new_for_validation(context.network, connector_1, connector_2, input_0, input_1)
     }
 
     pub fn new_for_validation(
@@ -94,7 +100,8 @@ impl StartTimeTimeoutTransaction {
         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 {
@@ -200,20 +207,6 @@ impl StartTimeTimeoutTransaction {
         );
     }
 
-    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,
@@ -247,4 +240,7 @@ 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 90%
rename from src/bridge/transactions/take_1.rs
rename to bridge/src/transactions/take_1.rs
index 7a3c40d1a..31fdfbacd 100644
--- a/src/bridge/transactions/take_1.rs
+++ b/bridge/src/transactions/take_1.rs
@@ -13,7 +13,6 @@ use super::{
             connector_b::ConnectorB,
         },
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -35,17 +34,27 @@ pub struct Take1Transaction {
 }
 
 impl PreSignedTransaction for Take1Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for Take1Transaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -65,9 +74,13 @@ 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,
@@ -98,6 +111,7 @@ impl Take1Transaction {
         this
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
@@ -122,7 +136,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,
@@ -203,7 +217,6 @@ impl Take1Transaction {
         let input_index = 1;
         pre_sign_taproot_input_default(
             self,
-            context,
             input_index,
             TapSighashType::All,
             connector_a.generate_taproot_spend_info(),
@@ -215,7 +228,6 @@ impl Take1Transaction {
         let input_index = 2;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
@@ -254,20 +266,6 @@ impl Take1Transaction {
         );
     }
 
-    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,
@@ -289,5 +287,10 @@ impl Take1Transaction {
 }
 
 impl BaseTransaction for Take1Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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 86%
rename from src/bridge/transactions/take_2.rs
rename to bridge/src/transactions/take_2.rs
index 933eadc33..40760e777 100644
--- a/src/bridge/transactions/take_2.rs
+++ b/bridge/src/transactions/take_2.rs
@@ -13,12 +13,12 @@ use super::{
             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)]
@@ -35,17 +35,27 @@ pub struct Take2Transaction {
 }
 
 impl PreSignedTransaction for Take2Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for Take2Transaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -65,9 +75,13 @@ 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,
@@ -93,11 +107,11 @@ impl Take2Transaction {
         );
 
         this.sign_input_1(context);
-        this.sign_input_3(context, connector_c);
 
         this
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
@@ -118,11 +132,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,
@@ -159,7 +172,7 @@ 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
             ],
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
@@ -203,7 +216,6 @@ impl Take2Transaction {
         let input_index = 1;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
@@ -244,30 +256,19 @@ impl Take2Transaction {
 
     fn sign_input_3(&mut self, context: &OperatorContext, connector_c: &ConnectorC) {
         let input_index = 3;
-        pre_sign_taproot_input_default(
-            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,
-            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,
@@ -282,6 +283,10 @@ impl Take2Transaction {
         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);
@@ -289,5 +294,10 @@ impl Take2Transaction {
 }
 
 impl BaseTransaction for Take2Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
+    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..6caf9c689
--- /dev/null
+++ b/bridge/src/utils.rs
@@ -0,0 +1,162 @@
+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())
+    });
+
+    paths.reverse();
+    while paths.len() > max_cache_files as usize {
+        let oldest = paths.pop().unwrap();
+        std::fs::remove_file(&oldest)
+            .inspect_err(|e| eprintln!("Failed to delete the old cache file: {}", e))
+            .inspect(|_| println!("Old cache file deleted: {:?}", oldest))
+            .ok();
+    }
+}
+
+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 88%
rename from tests/bridge/base/merge.rs
rename to bridge/tests/bridge/base/merge.rs
index 3ccda9db8..4adc75701 100644
--- a/tests/bridge/base/merge.rs
+++ b/bridge/tests/bridge/base/merge.rs
@@ -1,17 +1,16 @@
 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
@@ -19,7 +18,7 @@ async fn test_merge_add_new_input_and_output() {
     // Arrange
     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")
@@ -29,10 +28,7 @@ async fn test_merge_add_new_input_and_output() {
     let mut destination_challenge_tx = ChallengeTransaction::new(
         &config.operator_context,
         &config.connector_a,
-        Input {
-            outpoint,
-            amount,
-        },
+        Input { outpoint, amount },
         amount,
     );
 
@@ -45,7 +41,6 @@ async fn test_merge_add_new_input_and_output() {
     let input_script =
         generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key);
     source_challenge_tx.add_inputs_and_output(
-        &config.operator_context,
         &vec![InputWithScript {
             outpoint,
             amount: amount * 2,
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/tests/bridge/challenge/challenge.rs b/bridge/tests/bridge/challenge/challenge.rs
similarity index 57%
rename from tests/bridge/challenge/challenge.rs
rename to bridge/tests/bridge/challenge/challenge.rs
index 5bff9da3f..cdcfa7c41 100644
--- a/tests/bridge/challenge/challenge.rs
+++ b/bridge/tests/bridge/challenge/challenge.rs
@@ -1,16 +1,20 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount, OutPoint};
+use bitcoin::{Address, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::TaprootConnector,
-    graphs::base::{DUST_AMOUNT, INITIAL_AMOUNT},
+    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},
         challenge::ChallengeTransaction,
     },
 };
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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() {
@@ -20,43 +24,33 @@ async fn test_challenge_tx() {
     let crowdfunding_keypair = &config.depositor_context.depositor_keypair;
     let crowdfunding_public_key = &config.depositor_context.depositor_public_key;
 
-    let amount_0 = Amount::from_sat(DUST_AMOUNT);
-    let outpoint_0 = generate_stub_outpoint(
-        &config.client_0,
-        &config.connector_1.generate_taproot_address(),
-        amount_0,
-    )
-    .await;
+    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 address = generate_pay_to_pubkey_script_address(
+    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,
     );
-    let amount_1 = Amount::from_sat(INITIAL_AMOUNT * 2 / 3);
-
-    // Check there are two utxos
-    let crowdfunding_utxos = config
-        .client_0
-        .get_initial_utxos(address.clone(), amount_1)
+    funding_inputs.push((&crowdfunding_address, amount_1));
+    funding_inputs.push((&crowdfunding_address, amount_1));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
         .await
-        .unwrap_or_else(|| {
-            panic!(
-                "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-                address,
-                amount_1.to_sat()
-            );
-        });
+        .wait()
+        .await;
+
+    let outpoint_0 = generate_stub_outpoint(&config.client_0, &connector_a_address, amount_0).await;
 
-    if crowdfunding_utxos.len() < 2 {
-        panic!(
-            "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-            address,
-            amount_1.to_sat()
-        );
-    }
+    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,
@@ -74,21 +68,14 @@ async fn test_challenge_tx() {
     );
 
     challenge_tx.add_inputs_and_output(
-        &config.depositor_context,
         &vec![
             InputWithScript {
-                outpoint: OutPoint {
-                    txid: crowdfunding_utxos[0].txid,
-                    vout: crowdfunding_utxos[0].vout,
-                },
+                outpoint: crowdfunding_outpoints[0],
                 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,
-                },
+                outpoint: crowdfunding_outpoints[1],
                 amount: amount_1,
                 script: &generate_pay_to_pubkey_script(crowdfunding_public_key),
             },
@@ -98,11 +85,10 @@ async fn test_challenge_tx() {
     );
 
     let tx = challenge_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    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!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    println!("Challenge tx result: {:?}\n", result);
     assert!(result.is_ok());
 
     // assert refund balance
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..e53722b9b
--- /dev/null
+++ b/bridge/tests/bridge/client/fee.rs
@@ -0,0 +1,553 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    client::{
+        chain::{
+            chain::{Chain, PegOutEvent},
+            mock_adaptor::{MockAdaptor, MockAdaptorConfig},
+        },
+        client::BitVMClient,
+    },
+    commitments::CommitmentMessageId,
+    graphs::{
+        base::{max, 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 serial_test::serial;
+
+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]
+#[serial]
+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]
+#[serial]
+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;
+
+    println!("Verifier 0 push peg-out nonces");
+    config.client_0.push_verifier_nonces(&peg_out_graph_id);
+    config.client_0.flush().await;
+
+    println!("Verifier 1 push peg-out nonces");
+    config.client_1.sync().await;
+    config.client_1.push_verifier_nonces(&peg_out_graph_id);
+    config.client_1.flush().await;
+
+    println!("Verifier 0 pre-sign peg-out");
+    config.client_0.sync().await;
+    config.client_0.push_verifier_signature(&peg_out_graph_id);
+    config.client_0.flush().await;
+
+    println!("Verifier 1 pre-sign peg-out");
+    config.client_1.sync().await;
+    config.client_1.push_verifier_signature(&peg_out_graph_id);
+    config.client_1.flush().await;
+    config.client_0.sync().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;
+    wait_for_confirmation(config.network).await;
+
+    let (assert_commit1_tx, assert_commit2_tx) = peg_out_graph
+        .assert_commits(
+            &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;
+
+    // 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);
+}
+
+fn get_peg_in_graph_mut(client: &mut BitVMClient, id: String) -> &mut PegInGraph {
+    client.get_peg_in_graph_mut(&id).unwrap()
+}
+
+fn get_peg_out_graph_mut(client: &mut BitVMClient, id: String) -> &mut PegOutGraph {
+    client.get_peg_out_graph_mut(&id).unwrap()
+}
diff --git a/tests/bridge/client/merge.rs b/bridge/tests/bridge/client/merge.rs
similarity index 79%
rename from tests/bridge/client/merge.rs
rename to bridge/tests/bridge/client/merge.rs
index fc0cae955..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
@@ -50,7 +46,7 @@ async fn test_merge_add_new_graph() {
 async fn setup_and_create_graphs() -> (BitVMClient, PegInGraph, PegOutGraph) {
     let mut config = setup_test().await;
 
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE);
     let peg_in_outpoint = OutPoint {
         txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
             .unwrap(),
@@ -71,16 +67,14 @@ async fn setup_and_create_graphs() -> (BitVMClient, PegInGraph, PegOutGraph) {
         .create_peg_in_graph(input, &config.depositor_evm_address)
         .await;
 
-    config
-        .client_0
-        .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(
         &config.depositor_context,
@@ -91,13 +85,14 @@ async fn setup_and_create_graphs() -> (BitVMClient, PegInGraph, PegOutGraph) {
         &config.depositor_evm_address,
     );
 
-    let (new_peg_out_graph, _) = PegOutGraph::new(
+    let new_peg_out_graph = PegOutGraph::new(
         &config.operator_context,
         &new_peg_in_graph,
         Input {
             outpoint: peg_out_outpoint,
             amount,
         },
+        &config.commitment_secrets,
     );
 
     (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 72%
rename from tests/bridge/client/musig2_peg_in.rs
rename to bridge/tests/bridge/client/musig2_peg_in.rs
index 032a37cd0..6b4806ad5 100644
--- a/tests/bridge/client/musig2_peg_in.rs
+++ b/bridge/tests/bridge/client/musig2_peg_in.rs
@@ -1,19 +1,17 @@
-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 serial_test::serial;
-use tokio::time::sleep;
-
-use crate::bridge::faucet::Faucet;
 
-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]
@@ -23,14 +21,16 @@ async fn test_musig2_peg_in() {
     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();
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
     faucet
-        .fund_input_and_wait(&depositor_funding_utxo_address, amount)
+        .fund_input(&depositor_funding_utxo_address, amount)
+        .await
+        .wait()
         .await;
     let outpoint = generate_stub_outpoint(
         &depositor_operator_verifier_0_client,
@@ -47,7 +47,8 @@ async fn test_musig2_peg_in() {
     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;
@@ -57,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;
@@ -67,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;
@@ -77,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;
@@ -87,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;
@@ -96,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..4fa7adfa5
--- /dev/null
+++ b/bridge/tests/bridge/client/musig2_peg_out.rs
@@ -0,0 +1,688 @@
+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},
+        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 & 2...");
+        client
+            .broadcast_assert_commits(&peg_out_graph_id, &assert_proof)
+            .await
+            .expect("Failed to broadcast assert commit 1 & 2");
+        wait_for_confirmation_with_message(
+            client.source_network,
+            Some("peg-out assert commit 1 tx"),
+        )
+        .await;
+        // wait longer for node to process large transactions on multiple blocks
+        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);
+    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;
+
+    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-in 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-in 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-in");
+    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-in");
+    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;
+
+    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.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..d71da8090
--- /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,
+};
+
+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);
+    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 63%
rename from tests/bridge/client/validate.rs
rename to bridge/tests/bridge/client/validate.rs
index 244947efc..e041b29a5 100644
--- a/tests/bridge/client/validate.rs
+++ b/bridge/tests/bridge/client/validate.rs
@@ -2,31 +2,28 @@ 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 esplora_client::AsyncClient;
 
-use super::super::setup::setup_test;
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
 
 #[tokio::test]
 async fn test_validate_success() {
-    let (data, _) = setup_and_create_graphs().await;
+    let (esplora, data, _) = setup_and_create_graphs().await;
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(is_data_valid);
+    assert!(result);
 }
 
 #[tokio::test]
 async fn test_validate_invalid_previous_output() {
-    let (mut data, peg_in_outpoint) = setup_and_create_graphs().await;
+    let (esplora, mut data, peg_in_outpoint) = setup_and_create_graphs().await;
 
     let changed_outpoint = OutPoint {
         txid: peg_in_outpoint.txid,
@@ -36,64 +33,64 @@ async fn test_validate_invalid_previous_output() {
     let deposit_tx = data.peg_in_graphs[1].peg_in_deposit_transaction.tx_mut();
     deposit_tx.input[0].previous_output = changed_outpoint;
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(!is_data_valid);
+    assert!(!result);
 }
 
 #[tokio::test]
 async fn test_validate_invalid_script_sig() {
-    let (mut data, _) = setup_and_create_graphs().await;
+    let (esplora, mut data, _) = setup_and_create_graphs().await;
 
     let deposit_tx = data.peg_in_graphs[1].peg_in_deposit_transaction.tx_mut();
     deposit_tx.input[0].script_sig = generate_burn_script();
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(!is_data_valid);
+    assert!(!result);
 }
 
 #[tokio::test]
 async fn test_validate_invalid_sequence() {
-    let (mut data, _) = setup_and_create_graphs().await;
+    let (esplora, mut data, _) = setup_and_create_graphs().await;
 
     let deposit_tx = data.peg_in_graphs[1].peg_in_deposit_transaction.tx_mut();
     deposit_tx.input[0].sequence = bitcoin::Sequence(100);
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(!is_data_valid);
+    assert!(!result);
 }
 
 #[tokio::test]
 async fn test_validate_invalid_value() {
-    let (mut data, _) = setup_and_create_graphs().await;
+    let (esplora, mut data, _) = setup_and_create_graphs().await;
 
     let deposit_tx = data.peg_in_graphs[1].peg_in_deposit_transaction.tx_mut();
     deposit_tx.output[0].value = Amount::from_sat(1);
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(!is_data_valid);
+    assert!(!result);
 }
 
 #[tokio::test]
 async fn test_validate_invalid_script_pubkey() {
-    let (mut data, _) = setup_and_create_graphs().await;
+    let (esplora, mut data, _) = setup_and_create_graphs().await;
 
     let deposit_tx = data.peg_in_graphs[1].peg_in_deposit_transaction.tx_mut();
     deposit_tx.output[0].script_pubkey = generate_burn_script();
 
-    let is_data_valid = BitVMClient::validate_data(&data);
+    let result = BitVMClient::validate_data(&esplora, &data).await;
 
-    assert!(!is_data_valid);
+    assert!(!result);
 }
 
-async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
+async fn setup_and_create_graphs() -> (AsyncClient, BitVMClientPublicData, OutPoint) {
     let config = 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 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(),
@@ -123,13 +120,14 @@ async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
         &config.depositor_evm_address,
     );
 
-    let (peg_out_graph, _) = PegOutGraph::new(
+    let peg_out_graph = PegOutGraph::new(
         &config.operator_context,
         &peg_in_graph_0,
         Input {
             outpoint: peg_out_outpoint,
             amount: amount_0,
         },
+        &config.commitment_secrets,
     );
 
     let data = BitVMClientPublicData {
@@ -138,5 +136,5 @@ async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
         peg_out_graphs: vec![peg_out_graph],
     };
 
-    (data, peg_in_outpoint)
+    (config.client_0.esplora, data, peg_in_outpoint)
 }
diff --git a/tests/bridge/data_store/ftp.rs b/bridge/tests/bridge/data_store/ftp.rs
similarity index 72%
rename from tests/bridge/data_store/ftp.rs
rename to bridge/tests/bridge/data_store/ftp.rs
index 5a235c1aa..f5e4b8361 100644
--- a/tests/bridge/data_store/ftp.rs
+++ b/bridge/tests/bridge/data_store/ftp.rs
@@ -1,5 +1,6 @@
-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");
@@ -9,7 +10,7 @@ async fn test_ftp() {
 
     println!("Try to upload json");
     let result = ftp
-        .upload_json("ftp_test.json", "{\"dog\":\"cat\"}".to_string(), Some(path))
+        .upload_object("ftp_test.json", "{\"dog\":\"cat\"}", Some(path))
         .await;
     println!("Upload Result: {:?}", result);
 
@@ -19,7 +20,7 @@ async fn test_ftp() {
 
     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);
 }
diff --git a/tests/bridge/data_store/ftps.rs b/bridge/tests/bridge/data_store/ftps.rs
similarity index 67%
rename from tests/bridge/data_store/ftps.rs
rename to bridge/tests/bridge/data_store/ftps.rs
index 8b344aa34..96de248e5 100644
--- a/tests/bridge/data_store/ftps.rs
+++ b/bridge/tests/bridge/data_store/ftps.rs
@@ -1,5 +1,6 @@
-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");
@@ -9,11 +10,7 @@ async fn test_ftps() {
 
     println!("Try to upload json");
     let result = ftps
-        .upload_json(
-            "ftps_test.json",
-            "{\"dog\":\"cat\"}".to_string(),
-            Some(path),
-        )
+        .upload_object("ftps_test.json", "{\"dog\":\"cat\"}", Some(path))
         .await;
     println!("Upload Result: {:?}", result);
 
@@ -23,7 +20,7 @@ async fn test_ftps() {
 
     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);
 }
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 67%
rename from tests/bridge/data_store/sftp.rs
rename to bridge/tests/bridge/data_store/sftp.rs
index e6d284c9a..d930cfbc6 100644
--- a/tests/bridge/data_store/sftp.rs
+++ b/bridge/tests/bridge/data_store/sftp.rs
@@ -1,5 +1,6 @@
-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");
@@ -9,11 +10,7 @@ async fn test_sftp() {
 
     println!("Try to upload json");
     let result = sftp
-        .upload_json(
-            "sftp_test.json",
-            "{\"dog\":\"cat\"}".to_string(),
-            Some(path),
-        )
+        .upload_object("sftp_test.json", "{\"dog\":\"cat\"}", Some(path))
         .await;
     println!("Upload Result: {:?}", result);
 
@@ -22,6 +19,6 @@ async fn test_sftp() {
     println!("Objects: {:?}", objects);
 
     println!("Try to fetch json");
-    let json = sftp.fetch_json("sftp_test.json", Some(path)).await;
+    let json = sftp.fetch_object("sftp_test.json", Some(path)).await;
     println!("Json: {:?}", json);
 }
diff --git a/bridge/tests/bridge/disprove/disprove.rs b/bridge/tests/bridge/disprove/disprove.rs
new file mode 100644
index 000000000..9c04a0a8e
--- /dev/null
+++ b/bridge/tests/bridge/disprove/disprove.rs
@@ -0,0 +1,173 @@
+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},
+};
+
+// ignored for requiring assert txns, duplicate with disprove in integration
+// TODO: unless we can create dummy witness data
+#[ignore]
+#[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());
+}
+
+// ignored for requiring assert txns, duplicate with disprove in integration
+// TODO: unless we can create dummy witness data
+#[ignore]
+#[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 77%
rename from tests/bridge/chain/ethereum.rs
rename to bridge/tests/bridge/e2e/chain/ethereum.rs
index d77632218..331554d3d 100644
--- a/tests/bridge/chain/ethereum.rs
+++ b/bridge/tests/bridge/e2e/chain/ethereum.rs
@@ -1,14 +1,15 @@
 use alloy::{
     eips::BlockNumberOrTag, primitives::Address as EvmAddress, transports::http::reqwest::Url,
 };
-use bitvm::bridge::client::chain::{
-    base::ChainAdaptor,
-    ethereum::{EthereumAdaptor, EthereumInitConfig},
+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());
 
@@ -18,16 +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/src/bridge/client/chain/mod.rs b/bridge/tests/bridge/e2e/chain/mod.rs
similarity index 66%
rename from src/bridge/client/chain/mod.rs
rename to bridge/tests/bridge/e2e/chain/mod.rs
index 1ac558f40..ec0d223b4 100644
--- a/src/bridge/client/chain/mod.rs
+++ b/bridge/tests/bridge/e2e/chain/mod.rs
@@ -1,3 +1,3 @@
-pub mod base;
 pub mod chain;
 pub mod ethereum;
+pub mod peg_out;
diff --git a/tests/bridge/integration/chain/peg_out.rs b/bridge/tests/bridge/e2e/chain/peg_out.rs
similarity index 74%
rename from tests/bridge/integration/chain/peg_out.rs
rename to bridge/tests/bridge/e2e/chain/peg_out.rs
index b3690634e..760b22f61 100644
--- a/tests/bridge/integration/chain/peg_out.rs
+++ b/bridge/tests/bridge/e2e/chain/peg_out.rs
@@ -3,9 +3,12 @@ use alloy::{
 };
 use bitcoin::Amount;
 
-use bitvm::bridge::{
-    client::chain::{chain::Chain, ethereum::EthereumInitConfig},
-    graphs::base::{FEE_AMOUNT, INITIAL_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},
@@ -13,26 +16,31 @@ use bitvm::bridge::{
     },
 };
 
-use crate::bridge::{faucet::Faucet, helper::generate_stub_outpoint, setup::setup_test};
+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 mut adaptors = Chain::new();
-    adaptors.init_ethereum(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 events_result = adaptors.get_peg_out_init().await;
+    }));
+    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 + FEE_AMOUNT;
+    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(
@@ -44,9 +52,11 @@ async fn test_peg_out_for_chain() {
         operator_funding_utxo_address
     );
 
-    let faucet = Faucet::new();
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
     faucet
-        .fund_input_and_wait(&operator_funding_utxo_address, operator_input_amount)
+        .fund_input(&operator_funding_utxo_address, operator_input_amount)
+        .await
+        .wait()
         .await;
 
     let operator_funding_outpoint = generate_stub_outpoint(
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..efa441f04
--- /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]
+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..7b17626df
--- /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]
+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..d26654fcb
--- /dev/null
+++ b/bridge/tests/bridge/e2e/peg_out/utils.rs
@@ -0,0 +1,306 @@
+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, assert_commit_2_txid) = operator
+        .broadcast_assert_commits(peg_out_graph_id, proof)
+        .await
+        .expect("Failed to broadcast assert-commit 1 & 2");
+    print_tx_broadcasted("assert-commit 1", assert_commit_1_txid);
+    print_tx_broadcasted("assert-commit 2", assert_commit_2_txid);
+
+    wait_for_confirmation_with_message(network, Some("assert-commit 1 tx")).await;
+    // wait longer for node to process large transactions on multiple blocks
+    wait_for_confirmation_with_message(network, Some("assert-commit 2 tx")).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/tests/bridge/faucet.rs b/bridge/tests/bridge/faucet.rs
similarity index 55%
rename from tests/bridge/faucet.rs
rename to bridge/tests/bridge/faucet.rs
index ddd3bfc97..888c8998b 100644
--- a/tests/bridge/faucet.rs
+++ b/bridge/tests/bridge/faucet.rs
@@ -2,14 +2,16 @@ use alloy::transports::http::{
     reqwest::{Error, Response, StatusCode},
     Client,
 };
-use bitcoin::{Address, Amount, Txid};
-use bitvm::bridge::client::client::BitVMClient;
+use bitcoin::{Address, Amount, Network, Txid};
+use bridge::client::client::BitVMClient;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, time::Duration};
+use std::{collections::HashMap, process::Command, time::Duration};
 use tokio::time::sleep;
 
-use crate::bridge::helper::{ESPLORA_FUNDING_URL, TX_WAIT_TIME};
+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;
@@ -20,36 +22,57 @@ struct FundResult {
     address: String,
 }
 
+pub enum FaucetType {
+    Signet,
+    EsploraRegtest,
+}
+
 pub struct Faucet {
+    faucet_type: FaucetType,
     client: Client,
 }
 
 impl Default for Faucet {
     fn default() -> Self {
-        Self::new()
+        Self::new(FaucetType::EsploraRegtest)
     }
 }
 
 impl Faucet {
-    pub fn new() -> Self {
+    pub fn new(faucet_type: FaucetType) -> Self {
         let client = Client::builder()
             .build()
             .expect("Unable to build reqwest client");
-        Self { 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 fund_input_and_wait(&self, address: &Address, amount: Amount) -> Txid {
-        let txid = self.fund_input_with_retry(address, amount).await;
-        println!("Waiting for funding inputs tx...");
-        sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-        txid
+    pub async fn wait(&self) {
+        wait_for_confirmation_with_message(self.get_network(), Some("funding inputs tx")).await;
     }
 
-    pub async fn verify_and_fund_inputs(
+    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()
@@ -61,9 +84,30 @@ impl Faucet {
             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) {
-                self.fund_input_with_retry(input.0, input.1).await;
+                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 {
@@ -71,7 +115,7 @@ impl Faucet {
             panic!("Could not fund {} due to {:?}", address, e);
         };
         let mut resp = self
-            .fund_input(address, amount)
+            ._fund_input(address, amount)
             .await
             .unwrap_or_else(client_err_handler);
 
@@ -86,16 +130,17 @@ impl Faucet {
             .await;
             // sleep(Duration::from_secs(ESPLORA_RETRY_WAIT_TIME)).await;
             resp = self
-                .fund_input(address, amount)
+                ._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 {:?}",
+                "Could not fund {} with respond code {:?}, response: {:?}",
                 address,
-                resp.status()
+                resp.status(),
+                resp.text().await,
             );
         }
 
@@ -105,7 +150,7 @@ impl Faucet {
         result.txid
     }
 
-    async fn fund_input(&self, address: &Address, amount: Amount) -> Result<Response, Error> {
+    async fn _fund_input(&self, address: &Address, amount: Amount) -> Result<Response, Error> {
         let payload = format!(
             "{{\"sats\":{},\"address\":\"{}\"}}",
             amount.to_sat(),
@@ -116,12 +161,12 @@ impl Faucet {
             "Funding {:?} with {} sats at {}",
             address,
             amount.to_sat(),
-            ESPLORA_FUNDING_URL,
+            ALPEN_SIGNET_ESPLORA_URL,
         );
 
         Self::http_post(
             &self.client,
-            format!("{}api/onchain", ESPLORA_FUNDING_URL),
+            format!("{}api/onchain", ALPEN_SIGNET_ESPLORA_URL),
             payload,
         )
         .await
diff --git a/bridge/tests/bridge/helper.rs b/bridge/tests/bridge/helper.rs
new file mode 100644
index 000000000..27b4f7701
--- /dev/null
+++ b/bridge/tests/bridge/helper.rs
@@ -0,0 +1,322 @@
+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_HASH, NUM_PUBS, NUM_U256};
+use bitvm::signatures::HASH_LEN;
+use bridge::client::chain::chain::PegOutEvent;
+use bridge::client::data_store::local_file::TEST_DATA_DIRECTORY_NAME;
+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 INTERMEDIATE_VARIABLES_FILE_NAME: &str = "intermediates.bin";
+const TEST_CACHE_DIRECTORY_NAME: &str = "test_cache";
+
+pub fn get_intermediate_variables_cached() -> BTreeMap<String, usize> {
+    let intermediate_variables_cache_path = Path::new(TEST_DATA_DIRECTORY_NAME)
+        .join(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_HASH {
+            intermediate_variables.insert(format!("{}", i + NUM_PUBS + NUM_U256), HASH_LEN);
+        }
+
+        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/tests/bridge/integration/peg_in/peg_in.rs b/bridge/tests/bridge/integration/peg_in/peg_in.rs
similarity index 60%
rename from tests/bridge/integration/peg_in/peg_in.rs
rename to bridge/tests/bridge/integration/peg_in/peg_in.rs
index cbe8b2563..ac5104be3 100644
--- a/tests/bridge/integration/peg_in/peg_in.rs
+++ b/bridge/tests/bridge/integration/peg_in/peg_in.rs
@@ -3,22 +3,27 @@ use std::time::Duration;
 use bitcoin::{Amount, OutPoint};
 
 use crate::bridge::{
-    helper::generate_stub_outpoint,
-    setup::{setup_test, SetupConfig},
+    faucet::{Faucet, FaucetType},
+    helper::{generate_stub_outpoint, get_reward_amount, wait_for_timelock_expiry},
+    setup::{setup_test, SetupConfig, INITIAL_AMOUNT, ONE_HUNDRED},
 };
-use bitvm::bridge::{
+use bridge::{
     client::client::BitVMClient,
     connectors::{base::TaprootConnector, connector_0::Connector0},
     graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
+        base::{BaseGraph, PEG_OUT_FEE},
         peg_in::PegInVerifierStatus,
     },
     scripts::generate_pay_to_pubkey_script_address,
     transactions::{
-        base::{BaseTransaction, Input},
+        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;
@@ -27,25 +32,8 @@ use tokio::time::sleep;
 #[tokio::test]
 async fn test_peg_in_success() {
     let config = 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(
-        config.depositor_context.network,
-        &config.depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint = generate_stub_outpoint(
-        &config.client_0,
-        &deposit_funding_utxo_address,
-        deposit_input_amount,
-    )
-    .await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
+    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,
@@ -58,6 +46,7 @@ async fn test_peg_in_success() {
 
     // 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);
 
@@ -97,6 +86,7 @@ async fn test_peg_in_success() {
 
     // 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);
 
@@ -132,25 +122,11 @@ async fn test_peg_in_success() {
 #[tokio::test]
 async fn test_peg_in_time_lock_not_surpassed() {
     let config = 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(
-        config.depositor_context.network,
-        &config.depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint = generate_stub_outpoint(
-        &config.client_0,
-        &deposit_funding_utxo_address,
-        deposit_input_amount,
+    let deposit_input = get_pegin_input(
+        &config,
+        INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_REFUND,
     )
     .await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
 
     let peg_in_deposit = PegInDepositTransaction::new(
         &config.depositor_context,
@@ -162,6 +138,7 @@ async fn test_peg_in_time_lock_not_surpassed() {
 
     // 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
@@ -180,6 +157,7 @@ async fn test_peg_in_time_lock_not_surpassed() {
 
     // 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 {
@@ -194,25 +172,11 @@ async fn test_peg_in_time_lock_not_surpassed() {
 #[tokio::test]
 async fn test_peg_in_time_lock_surpassed() {
     let config = 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(
-        config.depositor_context.network,
-        &config.depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint = generate_stub_outpoint(
-        &config.client_0,
-        &deposit_funding_utxo_address,
-        deposit_input_amount,
+    let deposit_input = get_pegin_input(
+        &config,
+        INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_REFUND,
     )
     .await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
 
     let peg_in_deposit = PegInDepositTransaction::new(
         &config.depositor_context,
@@ -224,6 +188,7 @@ async fn test_peg_in_time_lock_surpassed() {
 
     // 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
@@ -242,8 +207,9 @@ async fn test_peg_in_time_lock_surpassed() {
     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
+    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
@@ -275,18 +241,34 @@ async fn test_peg_in_time_lock_surpassed() {
 }
 
 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,
@@ -297,76 +279,182 @@ async fn get_pegin_input(config: &SetupConfig, sats: u64) -> Input {
 async fn test_peg_in_graph_automatic_verifier() {
     // helper functions
     let sync = |a: &mut BitVMClient, b: &mut BitVMClient| {
-        a.merge_data(b.get_data().clone());
-        b.merge_data(a.get_data().clone());
+        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<_>>()
     };
-    let graph = |client: &BitVMClient| client.get_data().peg_in_graphs[0].clone();
-
     // set up data
     let mut config = setup_test().await;
-    let deposit_input = get_pegin_input(&config, INITIAL_AMOUNT + FEE_AMOUNT * 2).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();
-    let context = Some(&config.verifier_0_context);
 
     // 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, context).await,
+        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)).await;
+    client_0
+        .process_peg_in_as_depositor(&graph(client_0).id())
+        .await;
     loop {
-        if graph(client_0).verifier_status(&esplora, context).await
-            == PegInVerifierStatus::PendingOurNonces
-        {
+        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;
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::PendingOurNonces(vec![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)).await;
+    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, context).await,
+        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)).await;
+    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, context).await,
-        PegInVerifierStatus::PendingOurSignature
-    );
+    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)).await;
+    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, context).await,
+        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)).await;
+    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, context).await,
+        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)).await;
+    client_0
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
     loop {
-        if graph(client_0).verifier_status(&esplora, context).await == PegInVerifierStatus::Complete
+        if graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>(),
+            )
+            .await
+            == PegInVerifierStatus::Complete
         {
             break;
         }
diff --git a/tests/bridge/integration/peg_out/challenge.rs b/bridge/tests/bridge/integration/peg_out/challenge.rs
similarity index 75%
rename from tests/bridge/integration/peg_out/challenge.rs
rename to bridge/tests/bridge/integration/peg_out/challenge.rs
index b9f2c57d4..3f49bbdea 100644
--- a/tests/bridge/integration/peg_out/challenge.rs
+++ b/bridge/tests/bridge/integration/peg_out/challenge.rs
@@ -1,41 +1,52 @@
 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 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(
-        config.operator_context.network,
-        &config.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(
         config.depositor_context.network,
         &config.depositor_context.depositor_public_key,
     );
     funding_inputs.push((&challenge_funding_utxo_address, challenge_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
@@ -47,6 +58,7 @@ async fn test_challenge_success() {
         &config.connector_2,
         &config.connector_6,
         kick_off_1_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
@@ -79,7 +91,6 @@ async fn test_challenge_success() {
         challenge_input_amount,
     );
     challenge.add_inputs_and_output(
-        &config.depositor_context,
         &vec![challenge_crowdfunding_input],
         &config.depositor_context.depositor_keypair,
         generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key),
@@ -88,6 +99,7 @@ async fn test_challenge_success() {
     let challenge_txid = challenge_tx.compute_txid();
 
     // mine challenge tx
+    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());
 
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..d1bb4046e
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/disprove.rs
@@ -0,0 +1,327 @@
+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_confirmation, 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()
+    );
+    wait_for_confirmation(config.network).await;
+
+    // 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,
+        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/tests/bridge/integration/peg_out/disprove_chain.rs b/bridge/tests/bridge/integration/peg_out/disprove_chain.rs
similarity index 67%
rename from tests/bridge/integration/peg_out/disprove_chain.rs
rename to bridge/tests/bridge/integration/peg_out/disprove_chain.rs
index 75e4333f2..52e7eca9e 100644
--- a/tests/bridge/integration/peg_out/disprove_chain.rs
+++ b/bridge/tests/bridge/integration/peg_out/disprove_chain.rs
@@ -1,43 +1,52 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
 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_address,
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_DISPROVE_CHAIN, MIN_RELAY_FEE_KICK_OFF_2},
         disprove_chain::DisproveChainTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
     },
 };
 
 use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_2_tx,
-    setup::setup_test,
+    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},
 };
 
+#[ignore]
 #[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 + FEE_AMOUNT);
-    let kick_off_2_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
+    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(
+    let (kick_off_2_tx, kick_off_2_txid) = create_and_mine_kick_off_2_tx(
         &config.client_0,
         &config.operator_context,
-        &config.commitment_secrets,
+        &config.connector_1,
+        &config.connector_b,
         &kick_off_2_funding_utxo_address,
         kick_off_2_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
@@ -80,9 +89,11 @@ async fn test_disprove_chain_success() {
     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
-    sleep(Duration::from_secs(60)).await;
+    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
diff --git a/tests/bridge/integration/peg_out/kick_off_timeout.rs b/bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs
similarity index 69%
rename from tests/bridge/integration/peg_out/kick_off_timeout.rs
rename to bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs
index 9c352abd9..1430ccbba 100644
--- a/tests/bridge/integration/peg_out/kick_off_timeout.rs
+++ b/bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs
@@ -1,36 +1,43 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    connectors::connector_1::Connector1,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
+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},
+        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::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
+    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);
 
-    // 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(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
+    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,
     );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+    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(
@@ -41,6 +48,7 @@ async fn test_kick_off_timeout_success() {
         &config.connector_2,
         &config.connector_6,
         kick_off_1_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
@@ -96,12 +104,14 @@ async fn test_kick_off_timeout_success() {
     let kick_off_timeout_txid = kick_off_timeout_tx.compute_txid();
 
     // mine kick-off timeout
-    sleep(Duration::from_secs(60)).await;
+    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
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/tests/bridge/integration/peg_out/peg_out.rs b/bridge/tests/bridge/integration/peg_out/peg_out.rs
similarity index 60%
rename from tests/bridge/integration/peg_out/peg_out.rs
rename to bridge/tests/bridge/integration/peg_out/peg_out.rs
index d96b661fa..50044c75f 100644
--- a/tests/bridge/integration/peg_out/peg_out.rs
+++ b/bridge/tests/bridge/integration/peg_out/peg_out.rs
@@ -1,39 +1,44 @@
-use bitcoin::Amount;
+use bitcoin::{Address, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     client::chain::chain::PegOutEvent,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
+    scripts::{generate_p2pkh_address, generate_pay_to_pubkey_script_address},
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_OUT},
         peg_out::PegOutTransaction,
     },
 };
 
-use crate::bridge::{faucet::Faucet, helper::generate_stub_outpoint, setup::setup_test};
+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;
 
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT;
-    let operator_input_amount = Amount::from_sat(input_amount_raw);
+    // 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,
     );
-    println!(
-        "operator_funding_utxo_address: {:?}",
-        operator_funding_utxo_address
-    );
+    funding_inputs.push((&operator_funding_utxo_address, operator_input_amount));
 
-    let faucet = Faucet::new();
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
     faucet
-        .fund_input_and_wait(&operator_funding_utxo_address, operator_input_amount)
+        .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,
@@ -49,6 +54,11 @@ async fn test_peg_out_success() {
         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
@@ -66,6 +76,7 @@ async fn test_peg_out_success() {
     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);
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/tests/bridge/integration/peg_out/start_time_timeout.rs b/bridge/tests/bridge/integration/peg_out/start_time_timeout.rs
similarity index 67%
rename from tests/bridge/integration/peg_out/start_time_timeout.rs
rename to bridge/tests/bridge/integration/peg_out/start_time_timeout.rs
index a4f4dc6d0..e0948b248 100644
--- a/tests/bridge/integration/peg_out/start_time_timeout.rs
+++ b/bridge/tests/bridge/integration/peg_out/start_time_timeout.rs
@@ -1,33 +1,45 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
 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_address,
     transactions::{
-        base::{BaseTransaction, Input},
+        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::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
+    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 + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
+    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;
 
@@ -40,6 +52,7 @@ async fn test_start_time_timeout_success() {
         &config.connector_2,
         &config.connector_6,
         kick_off_1_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
@@ -93,13 +106,19 @@ async fn test_start_time_timeout_success() {
     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
-    sleep(Duration::from_secs(60)).await;
+    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
diff --git a/tests/bridge/integration/peg_out/take_1.rs b/bridge/tests/bridge/integration/peg_out/take_1.rs
similarity index 64%
rename from tests/bridge/integration/peg_out/take_1.rs
rename to bridge/tests/bridge/integration/peg_out/take_1.rs
index a4f275a3b..f6b2fe7bb 100644
--- a/tests/bridge/integration/peg_out/take_1.rs
+++ b/bridge/tests/bridge/integration/peg_out/take_1.rs
@@ -1,43 +1,55 @@
-use std::time::Duration;
-
 use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
+use bitvm::signatures::signing_winternitz::WinternitzSigningInputs;
+use bridge::{
+    commitments::CommitmentMessageId,
     connectors::base::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
+    graphs::base::{DUST_AMOUNT, MIN_RELAY_FEE_ASSERT_SET, PEG_OUT_FEE},
     scripts::generate_pay_to_pubkey_script_address,
+    superblock::{get_superblock_hash_message, get_superblock_message},
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_DISPROVE, MIN_RELAY_FEE_PEG_IN_CONFIRM,
+            MIN_RELAY_FEE_PEG_OUT_CONFIRM, MIN_RELAY_FEE_TAKE_1,
+        },
         kick_off_2::KickOff2Transaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
         take_1::Take1Transaction,
     },
 };
-use tokio::time::sleep;
 
 use crate::bridge::{
-    helper::verify_funding_inputs,
+    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,
+    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(INITIAL_AMOUNT + FEE_AMOUNT);
+    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 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(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
-    );
+    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;
 
@@ -63,6 +75,7 @@ async fn test_take_1_success() {
         &config.connector_2,
         &config.connector_6,
         kick_off_1_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
@@ -75,17 +88,32 @@ async fn test_take_1_success() {
         },
         amount: kick_off_1_tx.output[vout as usize].value,
     };
-    let kick_off_2 = KickOff2Transaction::new(
+    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
-    sleep(Duration::from_secs(60)).await;
+    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
@@ -153,9 +181,21 @@ async fn test_take_1_success() {
     let take_1_tx = take_1.finalize();
     let take_1_txid = take_1_tx.compute_txid();
 
+    // addtional dust is from kick off 1 connector a, plus txns had not been broadcasted in this test
+    check_tx_output_sum(
+        ONE_HUNDRED
+            + reward_amount
+            + MIN_RELAY_FEE_PEG_OUT_CONFIRM
+            + MIN_RELAY_FEE_ASSERT_SET
+            + MIN_RELAY_FEE_DISPROVE
+            - MIN_RELAY_FEE_TAKE_1
+            - DUST_AMOUNT,
+        &take_1_tx,
+    );
     // mine take 1
-    sleep(Duration::from_secs(60)).await;
+    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
diff --git a/tests/bridge/integration/peg_out/take_2.rs b/bridge/tests/bridge/integration/peg_out/take_2.rs
similarity index 77%
rename from tests/bridge/integration/peg_out/take_2.rs
rename to bridge/tests/bridge/integration/peg_out/take_2.rs
index 5cdc89e4e..5a0862ad2 100644
--- a/tests/bridge/integration/peg_out/take_2.rs
+++ b/bridge/tests/bridge/integration/peg_out/take_2.rs
@@ -1,37 +1,50 @@
-use std::time::Duration;
-
 use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
+use bridge::{
     connectors::base::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
+    graphs::base::DUST_AMOUNT,
     scripts::generate_pay_to_pubkey_script_address,
     transactions::{
-        base::{BaseTransaction, Input},
+        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 tokio::time::sleep;
 
 use crate::bridge::{
-    helper::verify_funding_inputs,
+    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,
+    setup::{setup_test_full, INITIAL_AMOUNT, ONE_HUNDRED},
 };
 
 #[tokio::test]
 async fn test_take_2_success() {
-    let config = setup_test().await;
+    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 + FEE_AMOUNT);
+    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 assert_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_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;
 
@@ -124,12 +137,16 @@ async fn test_take_2_success() {
         &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
-    sleep(Duration::from_secs(60)).await;
+    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
diff --git a/tests/bridge/integration/peg_out/utils.rs b/bridge/tests/bridge/integration/peg_out/utils.rs
similarity index 68%
rename from tests/bridge/integration/peg_out/utils.rs
rename to bridge/tests/bridge/integration/peg_out/utils.rs
index 59598cc55..59f1cc1a2 100644
--- a/tests/bridge/integration/peg_out/utils.rs
+++ b/bridge/tests/bridge/integration/peg_out/utils.rs
@@ -1,26 +1,30 @@
 use std::collections::HashMap;
 
 use bitcoin::{Address, Amount, Transaction, Txid};
-use bitvm::bridge::{
+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},
-    graphs::peg_out::CommitmentMessageId,
+    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,
-        signing_winternitz::{WinternitzPublicKey, WinternitzSecret},
+        pre_signed_musig2::PreSignedMusig2Transaction,
     },
 };
 
-use crate::bridge::helper::generate_stub_outpoint;
+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,
@@ -30,6 +34,7 @@ pub async fn create_and_mine_kick_off_1_tx(
     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;
@@ -37,18 +42,37 @@ pub async fn create_and_mine_kick_off_1_tx(
         outpoint: kick_off_1_funding_outpoint,
         amount: input_amount,
     };
-    let kick_off_1 = KickOff1Transaction::new(
+    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)
@@ -57,36 +81,47 @@ pub async fn create_and_mine_kick_off_1_tx(
 pub async fn create_and_mine_kick_off_2_tx(
     client: &BitVMClient,
     operator_context: &OperatorContext,
-    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+    connector_1: &Connector1,
+    connector_b: &ConnectorB,
     kick_off_2_funding_utxo_address: &Address,
     input_amount: Amount,
-) -> (Transaction, Txid, Connector1) {
-    let connector_1 = Connector1::new(
-        operator_context.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],
-            ),
-        )]),
-    );
+    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 kick_off_2 = KickOff2Transaction::new(operator_context, &connector_1, kick_off_2_input);
+    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, connector_1)
+    (kick_off_2_tx, kick_off_2_txid)
 }
 
 pub async fn create_and_mine_assert_tx(
@@ -125,6 +160,7 @@ pub async fn create_and_mine_assert_tx(
     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());
 
diff --git a/tests/bridge/kick_off_1/kick_off_1.rs b/bridge/tests/bridge/kick_off_1/kick_off_1.rs
similarity index 64%
rename from tests/bridge/kick_off_1/kick_off_1.rs
rename to bridge/tests/bridge/kick_off_1/kick_off_1.rs
index 6b0bbfc25..ca9964bd4 100644
--- a/tests/bridge/kick_off_1/kick_off_1.rs
+++ b/bridge/tests/bridge/kick_off_1/kick_off_1.rs
@@ -1,29 +1,37 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
+use bitcoin::Amount;
 
-use bitvm::bridge::{
+use bridge::{
+    commitments::CommitmentMessageId,
     connectors::base::TaprootConnector,
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT, MESSAGE_COMMITMENT_FEE_AMOUNT},
-        peg_out::CommitmentMessageId,
-    },
+    graphs::base::DUST_AMOUNT,
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_START_TIME},
         kick_off_1::KickOff1Transaction,
-        signing_winternitz::WinternitzSigningInputs,
     },
 };
 
-use crate::bridge::helper::generate_stub_outpoint;
+use bitvm::signatures::signing_winternitz::WinternitzSigningInputs;
 
-use super::super::setup::setup_test;
+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() {
+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 + MESSAGE_COMMITMENT_FEE_AMOUNT * 2 + FEE_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;
 
@@ -57,10 +65,9 @@ async fn test_kick_off_1_tx() {
     );
 
     let tx = kick_off_1_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    check_tx_output_sum(INITIAL_AMOUNT + subsequent_tx_fee, &tx);
     let result = config.client_0.esplora.broadcast(&tx).await;
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
     println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
+    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 93%
rename from tests/bridge/mod.rs
rename to bridge/tests/bridge/mod.rs
index fa4b15f78..a1686264b 100644
--- a/tests/bridge/mod.rs
+++ b/bridge/tests/bridge/mod.rs
@@ -1,18 +1,17 @@
 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;
 pub mod kick_off_2;
 pub mod kick_off_timeout;
-pub mod mock;
 pub mod peg_in;
 pub mod serialization;
 pub mod setup;
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/tests/bridge/peg_in/peg_in_confirm.rs b/bridge/tests/bridge/peg_in/peg_in_confirm.rs
similarity index 63%
rename from tests/bridge/peg_in/peg_in_confirm.rs
rename to bridge/tests/bridge/peg_in/peg_in_confirm.rs
index 6538ae005..b65c106e8 100644
--- a/tests/bridge/peg_in/peg_in_confirm.rs
+++ b/bridge/tests/bridge/peg_in/peg_in_confirm.rs
@@ -1,21 +1,31 @@
 use bitcoin::{consensus::encode::serialize_hex, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_CONFIRM},
         peg_in_confirm::PegInConfirmTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
     },
 };
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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() {
+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 + FEE_AMOUNT);
+    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(),
@@ -45,10 +55,10 @@ async fn test_peg_in_confirm_tx() {
     );
 
     let tx = peg_in_confirm_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
     let result = config.client_0.esplora.broadcast(&tx).await;
     println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
+    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/tests/bridge/serialization/assert_transaction.rs b/bridge/tests/bridge/serialization/assert_transaction.rs
similarity index 65%
rename from tests/bridge/serialization/assert_transaction.rs
rename to bridge/tests/bridge/serialization/assert_transaction.rs
index 7df6b0ef0..8a75f068b 100644
--- a/tests/bridge/serialization/assert_transaction.rs
+++ b/bridge/tests/bridge/serialization/assert_transaction.rs
@@ -1,19 +1,30 @@
 use bitcoin::Amount;
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::TaprootConnector,
-    graphs::base::ONE_HUNDRED,
     serialization::{deserialize, serialize},
-    transactions::{assert::AssertTransaction, base::Input},
+    transactions::{
+        assert::AssertTransaction, base::Input, pre_signed_musig2::PreSignedMusig2Transaction,
+    },
 };
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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().await;
-
-    let amount = Amount::from_sat(ONE_HUNDRED * 2 / 100);
+    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(),
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..33de9619d
--- /dev/null
+++ b/bridge/tests/bridge/setup.rs
@@ -0,0 +1,402 @@
+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 connector_c = ConnectorC::new(
+        config.network,
+        &config.operator_context.operator_taproot_public_key,
+        &commitment_public_keys,
+    );
+    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/tests/bridge/start_time/start_time.rs b/bridge/tests/bridge/start_time/start_time.rs
similarity index 55%
rename from tests/bridge/start_time/start_time.rs
rename to bridge/tests/bridge/start_time/start_time.rs
index d27a9422e..2b3bcf5df 100644
--- a/tests/bridge/start_time/start_time.rs
+++ b/bridge/tests/bridge/start_time/start_time.rs
@@ -1,23 +1,35 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
+use bitcoin::Amount;
 
-use bitvm::bridge::{
+use bridge::{
+    commitments::CommitmentMessageId,
     connectors::base::TaprootConnector,
-    graphs::{base::DUST_AMOUNT, peg_out::CommitmentMessageId},
+    graphs::base::DUST_AMOUNT,
     superblock::get_start_time_block_number,
     transactions::{
-        base::{BaseTransaction, Input},
+        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() {
+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);
+    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;
 
@@ -33,15 +45,16 @@ async fn test_start_time_tx() {
     start_time_tx.sign(
         &config.operator_context,
         &config.connector_2,
-        get_start_time_block_number(),
+        get_start_time_block_number(config.network),
         &config.commitment_secrets[&CommitmentMessageId::StartTime],
     );
 
     let tx = start_time_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    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!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    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/tests/bridge/start_time_timeout/start_time_timeout.rs b/bridge/tests/bridge/start_time_timeout/start_time_timeout.rs
similarity index 60%
rename from tests/bridge/start_time_timeout/start_time_timeout.rs
rename to bridge/tests/bridge/start_time_timeout/start_time_timeout.rs
index 5a290e67a..35bdf520d 100644
--- a/tests/bridge/start_time_timeout/start_time_timeout.rs
+++ b/bridge/tests/bridge/start_time_timeout/start_time_timeout.rs
@@ -1,32 +1,46 @@
-use bitcoin::{consensus::encode::serialize_hex, Address, Amount};
+use bitcoin::{Address, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::TaprootConnector,
-    graphs::base::{DUST_AMOUNT, ONE_HUNDRED},
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_START_TIME_TIMEOUT},
+        pre_signed_musig2::PreSignedMusig2Transaction,
         start_time_timeout::StartTimeTimeoutTransaction,
     },
 };
 
-use crate::bridge::helper::verify_funding_inputs;
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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() {
+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 input_value0 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
+    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;
 
@@ -64,12 +78,17 @@ async fn test_start_time_timeout_tx() {
         &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();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    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!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    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/tests/bridge/take_1/take_1.rs b/bridge/tests/bridge/take_1/take_1.rs
similarity index 63%
rename from tests/bridge/take_1/take_1.rs
rename to bridge/tests/bridge/take_1/take_1.rs
index bbd5dca8d..c6fd2b847 100644
--- a/tests/bridge/take_1/take_1.rs
+++ b/bridge/tests/bridge/take_1/take_1.rs
@@ -1,37 +1,54 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
+use bitcoin::{Address, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::{P2wshConnector, TaprootConnector},
-    graphs::base::{DUST_AMOUNT, FEE_AMOUNT, INITIAL_AMOUNT, ONE_HUNDRED},
+    graphs::base::DUST_AMOUNT,
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_TAKE_1},
+        pre_signed_musig2::PreSignedMusig2Transaction,
         take_1::Take1Transaction,
     },
 };
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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() {
+async fn test_take_1_tx_success() {
     let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
 
-    let input_value0 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
+    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();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
-
+    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();
-    let funding_outpoint1 =
-        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
-
+    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 input_value3 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address3 = config.connector_b.generate_taproot_address();
     let funding_outpoint3 =
         generate_stub_outpoint(&config.client_0, &funding_utxo_address3, input_value3).await;
 
@@ -76,10 +93,10 @@ async fn test_take_1_tx() {
     );
 
     let tx = take_1_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    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!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    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/tests/bridge/take_2/take_2.rs b/bridge/tests/bridge/take_2/take_2.rs
similarity index 61%
rename from tests/bridge/take_2/take_2.rs
rename to bridge/tests/bridge/take_2/take_2.rs
index 72c052769..8461fa4b3 100644
--- a/tests/bridge/take_2/take_2.rs
+++ b/bridge/tests/bridge/take_2/take_2.rs
@@ -1,37 +1,57 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
+use bitcoin::{Address, Amount};
 
-use bitvm::bridge::{
+use bridge::{
     connectors::base::{P2wshConnector, TaprootConnector},
-    graphs::base::{DUST_AMOUNT, FEE_AMOUNT, INITIAL_AMOUNT, ONE_HUNDRED},
+    graphs::base::DUST_AMOUNT,
     transactions::{
-        base::{BaseTransaction, Input},
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_TAKE_2},
+        pre_signed_musig2::PreSignedMusig2Transaction,
         take_2::Take2Transaction,
     },
 };
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+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() {
-    let config = setup_test().await;
+async fn test_take_2_tx_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
 
-    let input_value0 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
+    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();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+    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();
-    let funding_outpoint1 =
-        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
+    funding_inputs.push((&funding_utxo_address1, input_value1));
 
-    let input_value2 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
+    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();
-    let funding_outpoint2 =
-        generate_stub_outpoint(&config.client_0, &funding_utxo_address2, input_value2).await;
+    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;
 
@@ -75,11 +95,13 @@ async fn test_take_2_tx() {
         &secret_nonces_1,
     );
 
+    take_2_tx.sign(&config.operator_context, &config.connector_c);
+
     let tx = take_2_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
+    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!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    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/bridge/tests/bridge/validate/validate.rs b/bridge/tests/bridge/validate/validate.rs
new file mode 100644
index 000000000..b310db23c
--- /dev/null
+++ b/bridge/tests/bridge/validate/validate.rs
@@ -0,0 +1,210 @@
+use std::str::FromStr;
+
+use bitcoin::{Amount, OutPoint, Txid};
+
+use bridge::{
+    error::{Error, ValidationError},
+    graphs::{base::PEG_IN_FEE, peg_in::PegInGraph, peg_out::PegOutGraph},
+    scripts::generate_burn_script,
+    transactions::{base::Input, pre_signed::PreSignedTransaction},
+};
+use esplora_client::AsyncClient;
+
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
+
+#[tokio::test]
+async fn test_validate_success() {
+    let (peg_in_graph, peg_out_graph, _, esplora) = setup_and_create_graphs().await;
+
+    let is_peg_in_data_valid = peg_in_graph.validate();
+    let is_peg_out_data_valid = peg_out_graph.validate(&esplora).await;
+
+    assert!(is_peg_in_data_valid.is_ok());
+    assert!(is_peg_out_data_valid.is_ok());
+}
+
+#[tokio::test]
+async fn test_validate_invalid_previous_output() {
+    let (mut peg_in_graph, _, peg_in_outpoint, _) = setup_and_create_graphs().await;
+
+    let changed_outpoint = OutPoint {
+        txid: peg_in_outpoint.txid,
+        vout: peg_in_outpoint.vout + 1,
+    };
+    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
+    deposit_tx.input[0].previous_output = changed_outpoint;
+
+    let result = peg_in_graph.validate();
+
+    let refund_txid = peg_in_graph.peg_in_refund_transaction.tx().compute_txid();
+    assert!(matches!(
+        result,
+        Err(Error::Validation(ValidationError::TxValidationFailed(
+            _,
+            _,
+            _
+        )))
+    ));
+
+    if let Err(Error::Validation(ValidationError::TxValidationFailed(tx_name, txid, input_index))) =
+        result
+    {
+        assert_eq!(tx_name, "PegInRefund");
+        assert_eq!(txid, refund_txid);
+        assert_eq!(input_index, 0);
+    }
+}
+
+#[tokio::test]
+async fn test_validate_invalid_script_sig() {
+    let (mut peg_in_graph, _, _, _) = setup_and_create_graphs().await;
+
+    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
+    deposit_tx.input[0].script_sig = generate_burn_script();
+    let deposit_txid = deposit_tx.compute_txid();
+
+    let result = peg_in_graph.validate();
+
+    assert!(matches!(
+        result,
+        Err(Error::Validation(ValidationError::TxValidationFailed(
+            _,
+            _,
+            _
+        )))
+    ));
+
+    if let Err(Error::Validation(ValidationError::TxValidationFailed(tx_name, txid, input_index))) =
+        result
+    {
+        assert_eq!(tx_name, "PegInDeposit");
+        assert_eq!(txid, deposit_txid);
+        assert_eq!(input_index, 0);
+    }
+}
+
+#[tokio::test]
+async fn test_validate_invalid_sequence() {
+    let (mut peg_in_graph, _, _, _) = setup_and_create_graphs().await;
+
+    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
+    deposit_tx.input[0].sequence = bitcoin::Sequence(100);
+    let deposit_txid = deposit_tx.compute_txid();
+
+    let result = peg_in_graph.validate();
+
+    assert!(matches!(
+        result,
+        Err(Error::Validation(ValidationError::TxValidationFailed(
+            _,
+            _,
+            _
+        )))
+    ));
+
+    if let Err(Error::Validation(ValidationError::TxValidationFailed(tx_name, txid, input_index))) =
+        result
+    {
+        assert_eq!(tx_name, "PegInDeposit");
+        assert_eq!(txid, deposit_txid);
+        assert_eq!(input_index, 0);
+    }
+}
+
+#[tokio::test]
+async fn test_validate_invalid_value() {
+    let (mut peg_in_graph, _, _, _) = setup_and_create_graphs().await;
+
+    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
+    deposit_tx.output[0].value = Amount::from_sat(1);
+    let deposit_txid = deposit_tx.compute_txid();
+
+    let result = peg_in_graph.validate();
+
+    assert!(matches!(
+        result,
+        Err(Error::Validation(ValidationError::TxValidationFailed(
+            _,
+            _,
+            _
+        )))
+    ));
+
+    if let Err(Error::Validation(ValidationError::TxValidationFailed(tx_name, txid, input_index))) =
+        result
+    {
+        assert_eq!(tx_name, "PegInDeposit");
+        assert_eq!(txid, deposit_txid);
+        assert_eq!(input_index, 0);
+    }
+}
+
+#[tokio::test]
+async fn test_validate_invalid_script_pubkey() {
+    let (mut peg_in_graph, _, _, _) = setup_and_create_graphs().await;
+
+    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
+    deposit_tx.output[0].script_pubkey = generate_burn_script();
+    let deposit_txid = deposit_tx.compute_txid();
+
+    let result = peg_in_graph.validate();
+
+    assert!(matches!(
+        result,
+        Err(Error::Validation(ValidationError::TxValidationFailed(
+            _,
+            _,
+            _
+        )))
+    ));
+
+    if let Err(Error::Validation(ValidationError::TxValidationFailed(tx_name, txid, input_index))) =
+        result
+    {
+        assert_eq!(tx_name, "PegInDeposit");
+        assert_eq!(txid, deposit_txid);
+        assert_eq!(input_index, 0);
+    }
+}
+
+async fn setup_and_create_graphs() -> (PegInGraph, PegOutGraph, OutPoint, AsyncClient) {
+    let config = setup_test().await;
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let peg_in_outpoint = OutPoint {
+        txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
+            .unwrap(),
+        vout: 0,
+    };
+    let peg_out_outpoint = OutPoint {
+        txid: Txid::from_str("4e254eab8a41f14f56491813a7100cebe305d84edf09488001d9dd3d180a4900")
+            .unwrap(),
+        vout: 0,
+    };
+
+    let peg_in_graph = PegInGraph::new(
+        &config.depositor_context,
+        Input {
+            outpoint: peg_in_outpoint,
+            amount,
+        },
+        &config.depositor_evm_address,
+    );
+
+    let peg_out_graph = PegOutGraph::new(
+        &config.operator_context,
+        &peg_in_graph,
+        Input {
+            outpoint: peg_out_outpoint,
+            amount,
+        },
+        &config.commitment_secrets,
+    );
+
+    (
+        peg_in_graph,
+        peg_out_graph,
+        peg_in_outpoint,
+        config.client_0.esplora,
+    )
+}
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..5d93f4af9
--- /dev/null
+++ b/final-spv/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "final-spv"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = {version = "2.0.2", 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-literal = "0.4.1"
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/final-spv-guest/Cargo.toml b/final-spv/final-spv-guest/Cargo.toml
new file mode 100644
index 000000000..d16c5103f
--- /dev/null
+++ b/final-spv/final-spv-guest/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "final-spv-circuit"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+risc0-build = { version = "2.1.1" }
+risc0-binfmt = {version = "2.0.1"}
+
+[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..eacd18cb6
--- /dev/null
+++ b/final-spv/final-spv-guest/build.rs
@@ -0,0 +1,203 @@
+use risc0_binfmt::compute_image_id;
+use risc0_build::{embed_methods_with_options, DockerOptionsBuilder, GuestOptionsBuilder};
+use std::{collections::HashMap, env, fs, path::Path};
+
+fn main() {
+    // Build environment variables
+    println!("cargo:rerun-if-env-changed=SKIP_GUEST_BUILD");
+    println!("cargo:rerun-if-env-changed=REPR_GUEST_BUILD");
+    println!("cargo:rerun-if-env-changed=OUT_DIR");
+
+    // Compile time constant environment variables
+    println!("cargo:rerun-if-env-changed=BITCOIN_NETWORK");
+    println!("cargo:rerun-if-env-changed=TEST_SKIP_GUEST_BUILD");
+
+    if std::env::var("CLIPPY_ARGS").is_ok() {
+        let out_dir = env::var("OUT_DIR").expect("OUT_DIR not set");
+        let dummy_path = Path::new(&out_dir).join("methods.rs");
+        fs::write(dummy_path, "// dummy methods.rs for Clippy\n")
+            .expect("Failed to write dummy methods.rs");
+        println!("cargo:warning=Skipping guest build in Clippy");
+        return;
+    }
+
+    // Check if we should skip the guest build for tests
+    if let Ok("1" | "true") = env::var("TEST_SKIP_GUEST_BUILD").as_deref() {
+        println!("cargo:warning=Skipping guest build in test. Exiting");
+        return;
+    }
+
+    let network = env::var("BITCOIN_NETWORK").unwrap_or_else(|_| {
+        println!("cargo:warning=BITCOIN_NETWORK not set, defaulting to 'mainnet'");
+        "mainnet".to_string()
+    });
+    println!("cargo:warning=Building for Bitcoin network: {}", network);
+
+    let is_repr_guest_build = match env::var("REPR_GUEST_BUILD") {
+        Ok(value) => match value.as_str() {
+            "1" | "true" => {
+                println!("cargo:warning=REPR_GUEST_BUILD is set to true");
+                true
+            }
+            "0" | "false" => {
+                println!("cargo:warning=REPR_GUEST_BUILD is set to false");
+                false
+            }
+            _ => {
+                println!("cargo:warning=Invalid value for REPR_GUEST_BUILD: '{}'. Expected '0', '1', 'true', or 'false'. Defaulting to false.", value);
+                false
+            }
+        },
+        Err(env::VarError::NotPresent) => {
+            println!("cargo:warning=REPR_GUEST_BUILD not set. Defaulting to false.");
+            false
+        }
+        Err(env::VarError::NotUnicode(_)) => {
+            println!(
+                "cargo:warning=REPR_GUEST_BUILD contains invalid Unicode. Defaulting to false."
+            );
+            false
+        }
+    };
+
+    // Use embed_methods_with_options with our custom options
+    let guest_pkg_to_options = get_guest_options(network.clone());
+    embed_methods_with_options(guest_pkg_to_options);
+
+    // After the build is complete, copy the generated file to the elfs folder
+    if is_repr_guest_build {
+        println!("cargo:warning=Copying binary to elfs folder");
+        copy_binary_to_elfs_folder(network);
+    } else {
+        println!("cargo:warning=Not copying binary to elfs folder");
+    }
+}
+
+fn get_guest_options(network: String) -> HashMap<&'static str, risc0_build::GuestOptions> {
+    let mut guest_pkg_to_options = HashMap::new();
+
+    let opts = if env::var("REPR_GUEST_BUILD").is_ok() {
+        let manifest_dir = env!("CARGO_MANIFEST_DIR");
+        let root_dir = format!("{manifest_dir}/../../");
+
+        println!(
+            "cargo:warning=Using Docker for guest build with root dir: {}",
+            root_dir
+        );
+
+        let docker_opts = DockerOptionsBuilder::default()
+            .root_dir(root_dir)
+            .env(vec![("BITCOIN_NETWORK".to_string(), network.clone())])
+            .build()
+            .unwrap();
+
+        GuestOptionsBuilder::default()
+            // .features(features)
+            .use_docker(docker_opts)
+            .build()
+            .unwrap()
+    } else {
+        println!("cargo:warning=Guest code is not built in docker");
+        GuestOptionsBuilder::default()
+            // .features(features)
+            .build()
+            .unwrap()
+    };
+
+    guest_pkg_to_options.insert("final-spv-guest", opts);
+    guest_pkg_to_options
+}
+
+fn copy_binary_to_elfs_folder(network: String) {
+    let current_dir = env::current_dir().expect("Failed to get current dir");
+    // base_dir will be /home/ozan/workspace/BitVM/
+    let base_dir = current_dir
+        .join("../..")
+        .canonicalize()
+        .expect("Failed to canonicalize base_dir");
+
+    // Create elfs directory if it doesn't exist
+    let elfs_dir = base_dir.join("prover/elfs");
+    if !elfs_dir.exists() {
+        fs::create_dir_all(&elfs_dir).expect("Failed to create elfs directory");
+        println!("cargo:warning=Created elfs directory at {:?}", elfs_dir);
+    }
+
+    // Build source path (ensure this path is correct based on risc0_build's actual output location)
+    // This path assumes a specific structure relative to the workspace root.
+    // A more robust way might be to get this path from OUT_DIR if risc0_build places it there predictably.
+    let src_path = base_dir.join("target/riscv-guest/final-spv-circuit/final-spv-guest/riscv32im-risc0-zkvm-elf/docker/final-spv-guest.bin");
+
+    if !src_path.exists() {
+        // If the source ELF from the Docker build isn't found, the copy will fail.
+        // This could indicate an issue with the guest build itself or the path construction.
+        // The Docker build log (#8 and #9) suggests the ELF is built.
+        // RISC0 build scripts often place final ELFs in OUT_DIR/{method_name}.
+        // Consider using: let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+        //                let src_path = out_dir.join("final-spv-guest"); // or "final-spv-guest.elf" / ".bin"
+        println!(
+            "cargo:warning=Source binary not found at {:?}, skipping copy. This might be the root cause if copy fails.",
+            src_path
+        );
+        // It's important to ensure src_path is correct. For now, we assume it is based on your log.
+        // If the copy fails below, investigate src_path more deeply.
+        // return; // Or panic, as subsequent steps depend on this.
+    }
+
+    // Build destination path with network prefix
+    let dest_filename = format!("{}-final-spv-guest.bin", network.to_lowercase());
+    let dest_path = elfs_dir.join(&dest_filename); // This is an absolute PathBuf
+
+    // Copy the file
+    match fs::copy(&src_path, &dest_path) {
+        Ok(_) => println!(
+            "cargo:warning=Successfully copied binary from {:?} to {:?}",
+            src_path, dest_path
+        ),
+        Err(e) => {
+            // If the copy fails, the subsequent read will definitely fail.
+            // It's crucial to handle this, e.g., by panicking to stop the build with a clear message.
+            panic!(
+                "Failed to copy binary from {:?} to {:?}: {}. Subsequent ELF read will fail.",
+                src_path, dest_path, e
+            );
+        }
+    }
+
+    // The `elf_path` string below is used as a logical identifier or for constructing paths within the prover,
+    // but it should not be used directly for fs::read from the build script's CWD.
+    let logical_elf_path_for_id = match network.as_str() {
+        "mainnet" => "prover/elfs/mainnet-final-spv-guest.bin",
+        "testnet4" => "prover/elfs/testnet4-final-spv-guest.bin",
+        "signet" => "prover/elfs/signet-final-spv-guest.bin",
+        "regtest" => "prover/elfs/regtest-final-spv-guest.bin",
+        _ => {
+            println!(
+                "cargo:warning=Invalid network specified, defaulting to mainnet for logical path"
+            );
+            "prover/elfs/mainnet-final-spv-guest.bin"
+        }
+    };
+
+    println!(
+        "cargo:warning=Logical ELF path for ID computation: {:?}",
+        logical_elf_path_for_id
+    );
+
+    // --- THIS IS THE FIX ---
+    // Read the ELF file from `dest_path`, where it was actually copied.
+    // `dest_path` is already an absolute `PathBuf`.
+    println!(
+        "cargo:warning=Attempting to read ELF file from: {:?}",
+        dest_path
+    );
+    let elf_bytes: Vec<u8> = fs::read(&dest_path) // Use &dest_path here
+        .unwrap_or_else(|e| panic!("Failed to read ELF file from {:?}: {}", dest_path, e));
+
+    let method_id = compute_image_id(elf_bytes.as_slice()).unwrap();
+    println!("cargo:warning=Computed method ID: {:x?}", method_id);
+    println!(
+        "cargo:warning=Computed method ID words: {:?}",
+        method_id.as_words()
+    );
+}
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..4131131c5
--- /dev/null
+++ b/final-spv/final-spv-guest/guest/Cargo.lock
@@ -0,0 +1,1471 @@
+# 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 = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[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.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-r1cs-std",
+ "ark-std",
+]
+
+[[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",
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "ark-std",
+ "blake2",
+ "derivative",
+ "digest",
+ "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.90",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "educe",
+ "fnv",
+ "hashbrown",
+ "itertools",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "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",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "arrayvec",
+ "digest",
+ "educe",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "zeroize",
+]
+
+[[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.90",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88f1d0f3a534bb54188b8dcc104307db6c56cdae574ddc3212aec0625740fc7e"
+dependencies = [
+ "ark-crypto-primitives",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "educe",
+ "fnv",
+ "hashbrown",
+]
+
+[[package]]
+name = "ark-r1cs-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-std",
+ "educe",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "tracing",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384"
+dependencies = [
+ "ark-ff",
+ "ark-std",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "arrayvec",
+ "digest",
+ "num-bigint",
+]
+
+[[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.90",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d368e2848c2d4c129ce7679a7d0d2d612b6a274d3ea6a13bad4445d61b381b88"
+dependencies = [
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
+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 = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[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 = "cobs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+
+[[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 0.2.15",
+ "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 = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[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.90",
+ "unicode-xid",
+]
+
+[[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 = "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.90",
+]
+
+[[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 = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
+[[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.90",
+]
+
+[[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 = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[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 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+]
+
+[[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 = "include_bytes_aligned"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee796ad498c8d9a1d68e477df8f754ed784ef875de1414ebdaf169f70a6a784"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[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 = "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.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "no_std_strings"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5b0c77c1b780822bc749a33e39aeb2c07584ab93332303babeabb645298a76e"
+
+[[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 = "postcard"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "serde",
+]
+
+[[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 = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[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 = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fe7599ac55ad77515608ec42a9727001559fe4f579c533cb7c973b54800c05"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "derive_more",
+ "elf",
+ "lazy_static",
+ "postcard",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "semver",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd8acfc84307ed1be64cf9fefc390963fc22b2865d027f03405977a0cfa9747"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "paste",
+ "risc0-binfmt",
+ "risc0-circuit-recursion",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd1514e94440e2da301f48d345e1937b315147f58c5dc4992feb045324651d"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "hex",
+ "metal",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23f6ed144d8b8f93c4a6096e3dd90f9dcbd91eff83eae690a72fd6e640760b94"
+dependencies = [
+ "anyhow",
+ "bit-vec",
+ "bytemuck",
+ "derive_more",
+ "paste",
+ "risc0-binfmt",
+ "risc0-core",
+ "risc0-zkp",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317bbf70a8750b64d4fd7a2bdc9d7d5f30d8bb305cae486962c797ef35c8d08e"
+dependencies = [
+ "bytemuck",
+ "bytemuck_derive",
+ "rand_core",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b31cb7b2a46f0cdaf71803ea7e0389af9f5bc1aea2531106f2972b241f26e98"
+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-zkos-v1compat"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76c479b69d1987cb54ac72dcc017197296fdcd6daf78fafc10cbbd3a167a7de"
+dependencies = [
+ "include_bytes_aligned",
+ "no_std_strings",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa210a232361fd671b30918469856b64d715f2564956d0a5df97ab6cb116d28b"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest",
+ "hex",
+ "hex-literal",
+ "metal",
+ "paste",
+ "rand_core",
+ "risc0-core",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a049319790277845335445b549d49e66341f4a7ffba7f7aaa1e77e2fc4a9c19"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "bytemuck",
+ "derive_more",
+ "getrandom 0.2.15",
+ "hex",
+ "risc0-binfmt",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core",
+ "risc0-groth16",
+ "risc0-zkos-v1compat",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "rrs-lib",
+ "semver",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm-platform"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e4de2938eaf24892ef927d9cef6e4acb6a19ce01c017cd498533896f633f332"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "getrandom 0.3.3",
+ "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 = "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"
+dependencies = [
+ "serde",
+]
+
+[[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 = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[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 = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[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 = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[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..d05c2a685
--- /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") => [
+            1089137192, 2499827081, 1648551528, 3898441744, 1241508107, 1212614376, 523594555,
+            2385906108,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => [
+            1866422223, 3011666006, 1737793548, 1848006863, 1320341210, 1623031594, 1418162769,
+            4138395741,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"signet") => [
+            3760542186, 3452311364, 636757141, 2341919608, 3798837687, 3808746669, 4002435111,
+            318058396,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"regtest") => [
+            1361809821, 2352021461, 2194279832, 977027345, 356844560, 3592195208, 1085394392,
+            1717039563,
+        ],
+        None => [
+            1089137192, 2499827081, 1648551528, 3898441744, 1241508107, 1212614376, 523594555,
+            2385906108,
+        ],
+        _ => 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..98d760996
--- /dev/null
+++ b/final-spv/src/merkle_tree.rs
@@ -0,0 +1,375 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+use serde::{Deserialize, Serialize};
+
+use crate::utils::{calculate_double_sha256, calculate_sha256};
+
+use super::transaction::CircuitTransaction;
+
+/// Code is taken from Clementine
+/// https://github.com/chainwayxyz/clementine/blob/b600ea18df72bdc60015ded01b78131b4c9121d7/operator/src/bitcoin_merkle.rs
+///
+
+#[derive(Debug, Clone)]
+pub struct BitcoinMerkleTree {
+    nodes: Vec<Vec<[u8; 32]>>,
+}
+
+impl BitcoinMerkleTree {
+    /// Constructs a standard Bitcoin Merkle tree.
+    /// Leaf nodes are transaction IDs (txids), which are double-SHA256 hashes of transaction data.
+    /// Internal nodes are formed by `DSHA256(LeftChildHash || RightChildHash)`.
+    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) {
+                if tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2]
+                    == tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2 + 1]
+                {
+                    // This check helps prevent certain attacks involving duplicate hashes,
+                    // although the primary defense against CVE-2012-2459 and similar issues
+                    // in SPV often requires more structural changes or careful proof verification,
+                    // which the `new_mid_state` tree aims to provide. For more, please check:
+                    // https://github.com/bitcoin/bitcoin/blob/31d3eebfb92ae0521e18225d69be95e78fb02672/src/consensus/merkle.cpp#L9
+                    panic!("Duplicate hashes in the Merkle tree, indicating mutation");
+                }
+                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.div_ceil(2);
+            prev_level_index_offset = 0;
+        }
+        tree
+    }
+
+    // Returns the Merkle root
+    pub fn root(&self) -> [u8; 32] {
+        self.nodes[self.nodes.len() - 1][0]
+    }
+
+    /// Constructs a "mid-state" Merkle tree, designed for generating secure SPV (Simplified Payment Verification) proofs.
+    /// This structure, when used with the corresponding `calculate_root_with_merkle_proof` (or `BlockInclusionProof::get_root`) method,
+    /// helps mitigate vulnerabilities associated with standard Bitcoin Merkle trees in SPV contexts, such as certain forms of hash duplication or ambiguity attacks (e.g., CVE-2012-2459).
+    /// Also please check:
+    /// https://bitslog.com/2018/06/09/leaf-node-weakness-in-bitcoin-merkle-tree-design/ with the suggested fix:
+    /// https://bitslog.com/2018/08/21/simple-change-to-the-bitcoin-merkleblock-command-to-protect-from-leaf-node-weakness-in-transaction-merkle-tree/
+    ///
+    /// The leaves of this tree are transaction identifiers (`mid_state_txid()`), typically standard Bitcoin txids (double-SHA256 of the transaction).
+    /// The internal nodes of this "mid-state" tree are constructed differently from a standard Bitcoin Merkle tree:
+    /// `N_parent = SHA256(SHA256(N_child_left) || SHA256(N_child_right))`
+    /// where `N_child_left` and `N_child_right` are nodes from the level below in this mid-state tree.
+    ///
+    /// The root of this mid-state tree (`Root_ms`) is an intermediate hash. The actual Bitcoin block Merkle root
+    /// is expected to be `SHA256(Root_ms)`, as demonstrated in the test cases.
+    ///
+    /// The security enhancement for SPV comes from how proofs generated from this tree are verified:
+    /// specifically, sibling nodes from this tree's proof path are further hashed with `SHA256`
+    /// before being combined in the standard `double_SHA256` Merkle path computation during proof verification (see `BlockInclusionProof::get_root`).
+    /// This acts as a domain separation, ensuring that the internal nodes of this mid-state tree cannot be misinterpreted
+    /// as leaf txids or other hash types during verification.
+    pub fn new_mid_state(transactions: &[CircuitTransaction]) -> Self {
+        if transactions.len() == 1 {
+            // root is the coinbase mid-state txid (which is a standard txid)
+            return BitcoinMerkleTree {
+                nodes: vec![vec![transactions[0].mid_state_txid()]],
+            };
+        }
+
+        let mid_state_txids: Vec<[u8; 32]> =
+            transactions.iter().map(|tx| tx.mid_state_txid()).collect();
+
+        let mut tree = BitcoinMerkleTree {
+            nodes: vec![mid_state_txids], // Level 0: Leaf nodes (txids)
+        };
+
+        // 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]; // Preimage for SHA256(SHA256(LeftChild) || SHA256(RightChild))
+        while prev_level_size > 1 {
+            tree.nodes.push(vec![]);
+            for i in 0..(prev_level_size / 2) {
+                let left_child_node =
+                    tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2];
+                let right_child_node =
+                    tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2 + 1];
+
+                if left_child_node == right_child_node {
+                    // This check is also present in the mid-state tree construction.
+                    // While the primary defense is in the proof verification, preventing duplicate
+                    // inputs at this stage is good practice.
+                    panic!("Duplicate hashes in the Merkle tree, indicating mutation");
+                }
+                // Preimage construction: SHA256(LeftChildNode) || SHA256(RightChildNode)
+                preimage[..32].copy_from_slice(&calculate_sha256(&left_child_node));
+                preimage[32..].copy_from_slice(&calculate_sha256(&right_child_node));
+                // The new node is SHA256 of this preimage
+                let combined_mid_state_hash = calculate_sha256(&preimage);
+                tree.nodes[curr_level_offset].push(combined_mid_state_hash);
+            }
+            // Handle odd number of nodes at the previous level by duplicating the last node's hash processing
+            if prev_level_size % 2 == 1 {
+                let mut preimage: [u8; 64] = [0; 64];
+                let last_node = tree.nodes[curr_level_offset - 1]
+                    [prev_level_index_offset + prev_level_size - 1];
+                // Preimage: SHA256(LastNode) || SHA256(LastNode)
+                preimage[..32].copy_from_slice(&calculate_sha256(&last_node));
+                preimage[32..].copy_from_slice(&calculate_sha256(&last_node));
+                let combined_mid_state_hash = calculate_sha256(&preimage);
+                tree.nodes[curr_level_offset].push(combined_mid_state_hash);
+            }
+            curr_level_offset += 1;
+            prev_level_size = prev_level_size.div_ceil(2);
+            prev_level_index_offset = 0;
+        }
+        tree
+    }
+
+    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 {
+                // Current node is a right child, sibling is to the left
+                path.push(self.nodes[level as usize][i as usize - 1]);
+            } else if (self.nodes[level as usize].len() - 1) as u32 == i {
+                // Current node is a left child and the last one (odd one out)
+                path.push(self.nodes[level as usize][i as usize]); // Sibling is itself (implicitly, due to duplication rule)
+            } else {
+                // Current node is a left child, sibling is to the right
+                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)
+    }
+
+    /// Calculates the Bitcoin Merkle root from a leaf's transaction ID (mid_state_txid) and its inclusion proof
+    /// derived from a "mid-state" Merkle tree. This function is central to secure SPV.
+    ///
+    /// The `inclusion_proof` contains sibling nodes from the "mid-state" Merkle tree.
+    /// The security enhancement lies in how these proof elements are processed:
+    /// Each sibling node from the proof path is first hashed with `SHA256` before being
+    /// combined with the current hash using the standard Bitcoin `calculate_double_sha256` method.
+    ///
+    /// `current_hash = calculate_double_sha256(current_hash || SHA256(sibling_from_mid_state_proof))`
+    ///
+    /// This transformation of sibling proof elements acts as a domain separator,
+    /// robustly distinguishing them from leaf transaction IDs. This prevents vulnerabilities where an
+    /// attacker might craft a transaction whose ID could collide with or be misinterpreted as an
+    /// internal node of the mid-state tree, or create other ambiguities that could fool an SPV client.
+    /// The final `[u8; 32]` returned should match the block's official Merkle root.
+    pub fn calculate_root_with_merkle_proof(
+        mid_state_txid: [u8; 32], // This is the leaf txid (double-SHA256 of transaction)
+        inclusion_proof: BlockInclusionProof,
+    ) -> [u8; 32] {
+        inclusion_proof.get_root(mid_state_txid)
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct BlockInclusionProof {
+    idx: u32,
+    merkle_proof: Vec<[u8; 32]>, // These are sibling nodes from the "mid-state" Merkle tree
+}
+
+impl BlockInclusionProof {
+    pub fn new(idx: u32, merkle_proof: Vec<[u8; 32]>) -> Self {
+        BlockInclusionProof { idx, merkle_proof }
+    }
+
+    /// Calculates the Merkle root given a leaf transaction ID (`txid`, which is a `mid_state_txid`)
+    /// and the Merkle proof path (sibling nodes from the "mid-state" tree).
+    ///
+    /// The core of the SPV security enhancement is here:
+    /// Each `merkle_proof` element (a sibling node from the mid-state tree) is first hashed
+    /// with `calculate_sha256`. This transformed hash is then used in the standard Bitcoin
+    /// Merkle combination step (`calculate_double_sha256`).
+    ///
+    /// If `leaf` is the current hash and `P_mid_state` is a sibling from the proof path:
+    /// `next_hash = DSHA256(leaf || SHA256(P_mid_state))` (or reversed order).
+    ///
+    /// This ensures that elements from the mid-state tree's structure are treated distinctly
+    /// from the leaf transaction IDs, preventing cross-interpretation and related attacks.
+    /// The final hash should be the main Bitcoin block Merkle root.
+    pub fn get_root(&self, txid: [u8; 32]) -> [u8; 32] {
+        // txid is the leaf (e.g., mid_state_txid)
+        let mut preimage: [u8; 64] = [0; 64];
+        let mut combined_hash: [u8; 32] = txid; // Start with the leaf txid
+        let mut index = self.idx;
+        let mut level: u32 = 0;
+        while level < self.merkle_proof.len() as u32 {
+            // Get the sibling node from the mid-state tree proof path
+            let mid_state_sibling_node = self.merkle_proof[level as usize];
+            // Secure SPV step: transform the mid-state sibling node by SHA256-ing it
+            // before using it in the double-SHA256 combination.
+            let processed_sibling_hash = calculate_sha256(&mid_state_sibling_node);
+
+            if index % 2 == 0 {
+                // `combined_hash` is the left child
+                preimage[..32].copy_from_slice(&combined_hash);
+                preimage[32..].copy_from_slice(&processed_sibling_hash); // Use the SHA256'd mid-state sibling
+                combined_hash = calculate_double_sha256(&preimage);
+            } else {
+                // `combined_hash` is the right child
+                preimage[..32].copy_from_slice(&processed_sibling_hash); // Use the SHA256'd mid-state sibling
+                preimage[32..].copy_from_slice(&combined_hash);
+                combined_hash = calculate_double_sha256(&preimage);
+            }
+            level += 1;
+            index /= 2;
+        }
+        combined_hash // This should be the Bitcoin block's Merkle root
+    }
+}
+
+/// Verifies a Merkle proof against a given root using the "mid-state" tree approach.
+///
+/// - `mid_state_txid`: The transaction ID of the leaf node for which the proof is provided.
+/// - `inclusion_proof`: The proof path containing sibling nodes from the "mid-state" Merkle tree.
+/// - `root`: The expected Bitcoin Merkle root of the block.
+///
+/// This function recalculates the root using `inclusion_proof.get_root()` (which applies the
+/// SPV security measure of SHA256-ing mid-state proof elements) and compares it to the expected `root`.
+pub fn verify_merkle_proof(
+    mid_state_txid: [u8; 32],
+    inclusion_proof: &BlockInclusionProof,
+    root: [u8; 32],
+) -> bool {
+    let calculated_root = inclusion_proof.get_root(mid_state_txid);
+    calculated_root == root
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::transaction::CircuitTransaction;
+    use bitcoin::hashes::Hash;
+    use bitcoin::hex::FromHex;
+    use bitcoin::Block;
+
+    use super::*;
+
+    #[test]
+    fn test_merkle_tree_0() {
+        let block: Block = bitcoin::consensus::deserialize(&Vec::<u8>::from_hex("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 mid_state_merkle_tree = BitcoinMerkleTree::new_mid_state(&tx_vec);
+        let merkle_root = calculate_sha256(&mid_state_merkle_tree.root());
+        assert_eq!(
+            merkle_root,
+            block.header.merkle_root.as_raw_hash().to_byte_array()
+        );
+        let merkle_proof_0 = mid_state_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(&Vec::<u8>::from_hex("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()
+        );
+        let mid_state_merkle_tree: BitcoinMerkleTree = BitcoinMerkleTree::new_mid_state(&tx_vec);
+        let mid_state_merkle_root = calculate_sha256(&mid_state_merkle_tree.root());
+        assert_eq!(
+            mid_state_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 = mid_state_merkle_tree.generate_proof(i as u32);
+            assert!(verify_merkle_proof(txid, &merkle_proof_i, merkle_root));
+        }
+    }
+
+    // Should panic
+    #[test]
+    #[should_panic(expected = "Duplicate hashes in the Merkle tree, indicating mutation")]
+    fn test_malicious_merkle_tree_1() {
+        let txid_vec = vec![[1u8; 32], [2u8; 32], [3u8; 32]];
+        let _merkle_tree = BitcoinMerkleTree::new(txid_vec);
+        let malicious_tx_vec = vec![[1u8; 32], [2u8; 32], [3u8; 32], [3u8; 32]];
+        let _malicious_merkle_tree = BitcoinMerkleTree::new(malicious_tx_vec);
+    }
+
+    // Should panic
+    #[test]
+    #[should_panic(expected = "Duplicate hashes in the Merkle tree, indicating mutation")]
+    fn test_malicious_merkle_tree_2() {
+        let txid_vec = vec![
+            [1u8; 32], [2u8; 32], [3u8; 32], [4u8; 32], [5u8; 32], [6u8; 32],
+        ];
+        let _merkle_tree = BitcoinMerkleTree::new(txid_vec);
+        let malicious_tx_vec = vec![
+            [1u8; 32], [2u8; 32], [3u8; 32], [3u8; 32], [4u8; 32], [5u8; 32], [6u8; 32], [5u8; 32],
+            [6u8; 32],
+        ];
+        let _malicious_merkle_tree = BitcoinMerkleTree::new(malicious_tx_vec);
+    }
+}
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..8b90883b6
--- /dev/null
+++ b/final-spv/src/transaction.rs
@@ -0,0 +1,292 @@
+/// 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_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 mid_state = self.mid_state_txid();
+        calculate_sha256(&mid_state)
+    }
+
+    /// Returns the first digest of the transaction to be used in SPV
+    pub fn mid_state_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_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::*;
+    use bitcoin::hex::{DisplayHex, FromHex};
+
+    #[test]
+    fn test_txid_legacy() {
+        let tx = CircuitTransaction(bitcoin::consensus::deserialize(&Vec::<u8>::from_hex("0100000001c997a5e56e104102fa209c6a852dd90660a20b2d9c352423edce25857fcd3704000000004847304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901ffffffff0200ca9a3b00000000434104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84cac00286bee0000000043410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3ac00000000").unwrap()).unwrap());
+        let mut txid = tx.txid();
+        txid.reverse();
+        assert_eq!(
+            txid.to_lower_hex_string(),
+            "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16"
+        );
+    }
+
+    #[test]
+    fn test_txid_segwit() {
+        let tx = CircuitTransaction(bitcoin::consensus::deserialize(&Vec::<u8>::from_hex("0100000000010142ec43062180882d239799f134f7d8e9d104f37d87643e35fda84c47e4fc67a00000000000ffffffff026734000000000000225120e86c9c8c6777f28af40ef0c4cbd8308d27b60c7adf4f668d2433113616ddaa33cf660000000000001976a9149893ea81967d770f07f9bf0f659e3bce155be99a88ac01418a3d2a2182154dfd083cf48bfcd9f7dfb9d09eb46515e0043cdf39b688e9e711a2ce47f0f535191368be52fd706d77eb82eacd293a6a881491cdadf99b1df4400100000000").unwrap()).unwrap());
+        let mut txid = tx.txid();
+        txid.reverse();
+        assert_eq!(
+            txid.to_lower_hex_string(),
+            "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..efb8b39f9
--- /dev/null
+++ b/final-spv/src/zkvm.rs
@@ -0,0 +1,54 @@
+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..937649e4a
--- /dev/null
+++ b/fuzz/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "bitvm-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+arbitrary = { version = "1.4.1", features = ["derive"] }
+libfuzzer-sys = "0.4"
+bitvm = { path = "../bitvm", features = ["fuzzing"] }
+blake3 = "1.6.1"
+bitcoin = { version = "0.32.5" }
+bitcoin-script = { git = "https://github.com/BitVM/rust-bitcoin-script" }
+bitcoin-script-stack = { git = "https://github.com/BitVM/rust-bitcoin-script-stack" }
+
+[lib]
+path = "fuzz_targets/bigint/lib.rs"
+
+[[bin]]
+name = "blake3"
+path = "fuzz_targets/blake3.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "bigint_transform"
+path = "fuzz_targets/bigint/bigint_transform.rs"
+test = false
+doc = false
+bench = false
diff --git a/fuzz/fuzz_targets/bigint/bigint_transform.rs b/fuzz/fuzz_targets/bigint/bigint_transform.rs
new file mode 100644
index 000000000..44ec5b6fd
--- /dev/null
+++ b/fuzz/fuzz_targets/bigint/bigint_transform.rs
@@ -0,0 +1,126 @@
+#![no_main]
+
+use arbitrary::{Arbitrary, Result, Unstructured};
+use bitcoin::ScriptBuf;
+use bitcoin_script_stack::optimizer::optimize;
+use libfuzzer_sys::fuzz_target;
+
+use bitvm::bigint::{BigIntImpl, U254, U256, U64};
+use bitvm::execute_script_buf;
+use bitvm_fuzz::{match_bigint_type, utils::bigint_verify_output_script};
+
+pub type U384 = BigIntImpl<384, 29>;
+
+pub const BIGINT_TYPE_LAST_INDEX: u32 = 3;
+
+#[derive(Debug)]
+pub enum BigIntType {
+    U64(U64),
+    U254(U254),
+    U256(U256),
+    U384(U384), // We use 256bit (BN254), but test for others (e.g. BLS12-381)
+}
+
+// We are 99.999% confident with 500 limb transformations that all 31 values are covered, assuming random distribution (see inclusion-exclusion principle)
+// Note: This doesn't consider every limb permutation
+#[derive(Debug)]
+pub struct BigIntConfig<const TRANSFORM_LIST_SIZE: usize = 500> {
+    pub value: Vec<u32>,
+    pub bigint_type: BigIntType,
+    pub transform_list: [u32; TRANSFORM_LIST_SIZE],
+}
+
+impl BigIntType {
+    pub fn from_index(idx: u32) -> Self {
+        match idx {
+            0 => Self::U64(U64 {}),
+            1 => Self::U254(U254 {}),
+            2 => Self::U256(U256 {}),
+            3 => Self::U384(U384 {}),
+            _ => panic!("Invalid BigIntType index"),
+        }
+    }
+
+    pub fn n_bits(&self) -> u32 {
+        match self {
+            BigIntType::U64(_) => U64::N_BITS,
+            BigIntType::U254(_) => U254::N_BITS,
+            BigIntType::U256(_) => U256::N_BITS,
+            BigIntType::U384(_) => U384::N_BITS,
+        }
+    }
+
+    pub fn limb_size(&self) -> u32 {
+        match self {
+            BigIntType::U64(_) => U64::LIMB_SIZE,
+            BigIntType::U254(_) => U254::LIMB_SIZE,
+            BigIntType::U256(_) => U256::LIMB_SIZE,
+            BigIntType::U384(_) => U384::LIMB_SIZE,
+        }
+    }
+}
+
+impl BigIntConfig {
+    pub fn create_transform_script(&self) -> Vec<u8> {
+        let mut bytes = match_bigint_type!(self.bigint_type, push_u32_le, self.value.as_ref())
+            .compile()
+            .to_bytes();
+
+        let first_transform = match_bigint_type!(
+            self.bigint_type,
+            transform_limbsize,
+            self.bigint_type.limb_size(),
+            self.transform_list[0]
+        );
+        bytes.extend_from_slice(first_transform.compile().as_bytes());
+
+        // Intermediate transforms
+        for window in self.transform_list.windows(2) {
+            let transform =
+                match_bigint_type!(self.bigint_type, transform_limbsize, window[0], window[1]);
+            bytes.extend_from_slice(transform.compile().as_bytes());
+        }
+
+        let final_transform = match_bigint_type!(
+            self.bigint_type,
+            transform_limbsize,
+            *self.transform_list.last().unwrap(),
+            self.bigint_type.limb_size()
+        );
+        bytes.extend_from_slice(final_transform.compile().as_bytes());
+
+        let push_original = match_bigint_type!(self.bigint_type, push_u32_le, self.value.as_ref());
+        bytes.extend_from_slice(push_original.compile().as_bytes());
+
+        bytes
+    }
+}
+
+impl<'a, const TRANSFORM_LIST_SIZE: usize> Arbitrary<'a> for BigIntConfig<TRANSFORM_LIST_SIZE> {
+    fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
+        let bigint_type = BigIntType::from_index(u.int_in_range(0..=BIGINT_TYPE_LAST_INDEX)?);
+        let n_bits = bigint_type.n_bits();
+        let transform_list = std::array::from_fn(|_| u.int_in_range(1..=31).unwrap());
+        let value = (0..(n_bits.div_ceil(bigint_type.limb_size())))
+            .map(|_| u.arbitrary())
+            .collect::<Result<Vec<u32>>>()?;
+
+        Ok(BigIntConfig {
+            value,
+            bigint_type,
+            transform_list,
+        })
+    }
+}
+
+fuzz_target!(|message: BigIntConfig| {
+    let mut bytes = message.create_transform_script();
+    bytes.extend_from_slice(
+        bigint_verify_output_script(message.value.len() as u32)
+            .compile()
+            .as_bytes(),
+    );
+
+    let script = optimize(ScriptBuf::from_bytes(bytes));
+    assert!(execute_script_buf(script).success);
+});
diff --git a/fuzz/fuzz_targets/bigint/lib.rs b/fuzz/fuzz_targets/bigint/lib.rs
new file mode 100644
index 000000000..20f2366cc
--- /dev/null
+++ b/fuzz/fuzz_targets/bigint/lib.rs
@@ -0,0 +1,2 @@
+pub mod macros;
+pub mod utils;
diff --git a/fuzz/fuzz_targets/bigint/macros.rs b/fuzz/fuzz_targets/bigint/macros.rs
new file mode 100644
index 000000000..ff9cf5dca
--- /dev/null
+++ b/fuzz/fuzz_targets/bigint/macros.rs
@@ -0,0 +1,11 @@
+#[macro_export]
+macro_rules! match_bigint_type {
+    ($bigint_enum:expr, $method:ident $(, $args:expr)* ) => {
+        match $bigint_enum {
+            BigIntType::U64(_)  => U64::$method($($args),*),
+            BigIntType::U254(_) => U254::$method($($args),*),
+            BigIntType::U256(_) => U256::$method($($args),*),
+            BigIntType::U384(_) => U384::$method($($args),*),
+        }
+    };
+}
diff --git a/fuzz/fuzz_targets/bigint/utils.rs b/fuzz/fuzz_targets/bigint/utils.rs
new file mode 100644
index 000000000..fa8070c4e
--- /dev/null
+++ b/fuzz/fuzz_targets/bigint/utils.rs
@@ -0,0 +1,13 @@
+use bitvm::treepp::*;
+
+// Verifies two bigints of n_element size on the stack
+pub fn bigint_verify_output_script(n_elements: u32) -> Script {
+    script! {
+        for i in (2..n_elements + 1).rev() {
+            {i}
+            OP_ROLL
+            OP_EQUALVERIFY
+        }
+        OP_EQUAL
+    }
+}
diff --git a/fuzz/fuzz_targets/blake3.rs b/fuzz/fuzz_targets/blake3.rs
new file mode 100644
index 000000000..7ea0b07e2
--- /dev/null
+++ b/fuzz/fuzz_targets/blake3.rs
@@ -0,0 +1,80 @@
+#![no_main]
+
+use std::iter::IntoIterator;
+use std::sync::LazyLock;
+
+use arbitrary::Arbitrary;
+use bitcoin::ScriptBuf;
+use bitcoin_script_stack::optimizer;
+use bitvm::execute_script_buf;
+use bitvm::hash::blake3::{
+    blake3_compute_script, blake3_push_message_script_with_limb, blake3_verify_output_script,
+};
+use libfuzzer_sys::fuzz_target;
+
+static BLAKE3_COMPUTE_SCRIPTS: LazyLock<[ScriptBuf; 4]> = LazyLock::new(|| {
+    [64, 128, 192, 448]
+        .into_iter()
+        .map(|msg_len| blake3_compute_script(msg_len).compile())
+        .map(optimizer::optimize)
+        .collect::<Vec<ScriptBuf>>()
+        .try_into()
+        .unwrap()
+});
+
+/// Cover all message sizes that are used inside BitVM.
+///
+/// Each message size is processed by a different BLAKE3 Bitcoin script.
+/// Computing and optimizing each of these scripts takes considerable time.
+/// Even when we cache the result, the fuzzer has to wait until all scripts are gennerated.
+///
+/// In order to get useful coverage while keeping computational effort low,
+/// we fuzz exactly the message sizes that are used inside BitVM.
+/// It turns out, there are only four different sizes.
+#[derive(Debug, Clone, Arbitrary)]
+#[allow(clippy::large_enum_variant)]
+enum MessageBytes {
+    U64([u8; 64]),
+    U128([u8; 128]),
+    U192([u8; 192]),
+    U448([u8; 448]),
+}
+
+impl AsRef<[u8]> for MessageBytes {
+    fn as_ref(&self) -> &[u8] {
+        match self {
+            Self::U64(bytes) => bytes,
+            Self::U128(bytes) => bytes,
+            Self::U192(bytes) => bytes,
+            Self::U448(bytes) => bytes,
+        }
+    }
+}
+
+impl MessageBytes {
+    pub fn blake3_compute_script(&self) -> &'static ScriptBuf {
+        let index = match self {
+            Self::U64(..) => 0,
+            Self::U128(..) => 1,
+            Self::U192(..) => 2,
+            Self::U448(..) => 3,
+        };
+        &BLAKE3_COMPUTE_SCRIPTS[index]
+    }
+}
+
+fuzz_target!(|message: MessageBytes| {
+    let expected_hash = *blake3::hash(message.as_ref()).as_bytes();
+    // Fuzz tests are left only for bigints (limb_len = 29)
+    let mut bytes = blake3_push_message_script_with_limb(message.as_ref(), 29)
+        .compile()
+        .to_bytes();
+    bytes.extend_from_slice(message.blake3_compute_script().as_bytes());
+    bytes.extend_from_slice(
+        blake3_verify_output_script(expected_hash)
+            .compile()
+            .as_bytes(),
+    );
+    let script = ScriptBuf::from_bytes(bytes);
+    assert!(execute_script_buf(script).success);
+});
diff --git a/header-chain/Cargo.toml b/header-chain/Cargo.toml
new file mode 100644
index 000000000..cb03dd8ba
--- /dev/null
+++ b/header-chain/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "header-chain"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = {version = "2.0.2", 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-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/header-chain-guest/Cargo.toml b/header-chain/header-chain-guest/Cargo.toml
new file mode 100644
index 000000000..a093f4a8b
--- /dev/null
+++ b/header-chain/header-chain-guest/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "header-chain-circuit"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+risc0-build = { version = "2.1.1" }
+risc0-binfmt = {version = "2.0.1"}
+
+[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..722c6979b
--- /dev/null
+++ b/header-chain/header-chain-guest/build.rs
@@ -0,0 +1,203 @@
+use risc0_binfmt::compute_image_id;
+use risc0_build::{embed_methods_with_options, DockerOptionsBuilder, GuestOptionsBuilder};
+use std::{collections::HashMap, env, fs, path::Path};
+
+fn main() {
+    // Build environment variables
+    println!("cargo:rerun-if-env-changed=SKIP_GUEST_BUILD");
+    println!("cargo:rerun-if-env-changed=REPR_GUEST_BUILD");
+    println!("cargo:rerun-if-env-changed=OUT_DIR");
+
+    // Compile time constant environment variables
+    println!("cargo:rerun-if-env-changed=BITCOIN_NETWORK");
+    println!("cargo:rerun-if-env-changed=TEST_SKIP_GUEST_BUILD");
+
+    if std::env::var("CLIPPY_ARGS").is_ok() {
+        let out_dir = env::var("OUT_DIR").expect("OUT_DIR not set");
+        let dummy_path = Path::new(&out_dir).join("methods.rs");
+        fs::write(dummy_path, "// dummy methods.rs for Clippy\n")
+            .expect("Failed to write dummy methods.rs");
+        println!("cargo:warning=Skipping guest build in Clippy");
+        return;
+    }
+
+    // Check if we should skip the guest build for tests
+    if let Ok("1" | "true") = env::var("TEST_SKIP_GUEST_BUILD").as_deref() {
+        println!("cargo:warning=Skipping guest build in test. Exiting");
+        return;
+    }
+
+    let network = env::var("BITCOIN_NETWORK").unwrap_or_else(|_| {
+        println!("cargo:warning=BITCOIN_NETWORK not set, defaulting to 'mainnet'");
+        "mainnet".to_string()
+    });
+    println!("cargo:warning=Building for Bitcoin network: {}", network);
+
+    let is_repr_guest_build = match env::var("REPR_GUEST_BUILD") {
+        Ok(value) => match value.as_str() {
+            "1" | "true" => {
+                println!("cargo:warning=REPR_GUEST_BUILD is set to true");
+                true
+            }
+            "0" | "false" => {
+                println!("cargo:warning=REPR_GUEST_BUILD is set to false");
+                false
+            }
+            _ => {
+                println!("cargo:warning=Invalid value for REPR_GUEST_BUILD: '{}'. Expected '0', '1', 'true', or 'false'. Defaulting to false.", value);
+                false
+            }
+        },
+        Err(env::VarError::NotPresent) => {
+            println!("cargo:warning=REPR_GUEST_BUILD not set. Defaulting to false.");
+            false
+        }
+        Err(env::VarError::NotUnicode(_)) => {
+            println!(
+                "cargo:warning=REPR_GUEST_BUILD contains invalid Unicode. Defaulting to false."
+            );
+            false
+        }
+    };
+
+    // Use embed_methods_with_options with our custom options
+    let guest_pkg_to_options = get_guest_options(network.clone());
+    embed_methods_with_options(guest_pkg_to_options);
+
+    // After the build is complete, copy the generated file to the elfs folder
+    if is_repr_guest_build {
+        println!("cargo:warning=Copying binary to elfs folder");
+        copy_binary_to_elfs_folder(network);
+    } else {
+        println!("cargo:warning=Not copying binary to elfs folder");
+    }
+}
+
+fn get_guest_options(network: String) -> HashMap<&'static str, risc0_build::GuestOptions> {
+    let mut guest_pkg_to_options = HashMap::new();
+
+    let opts = if env::var("REPR_GUEST_BUILD").is_ok() {
+        let manifest_dir = env!("CARGO_MANIFEST_DIR");
+        let root_dir = format!("{manifest_dir}/../../");
+
+        println!(
+            "cargo:warning=Using Docker for guest build with root dir: {}",
+            root_dir
+        );
+
+        let docker_opts = DockerOptionsBuilder::default()
+            .root_dir(root_dir)
+            .env(vec![("BITCOIN_NETWORK".to_string(), network.clone())])
+            .build()
+            .unwrap();
+
+        GuestOptionsBuilder::default()
+            // .features(features)
+            .use_docker(docker_opts)
+            .build()
+            .unwrap()
+    } else {
+        println!("cargo:warning=Guest code is not built in docker");
+        GuestOptionsBuilder::default()
+            // .features(features)
+            .build()
+            .unwrap()
+    };
+
+    guest_pkg_to_options.insert("header-chain-guest", opts);
+    guest_pkg_to_options
+}
+
+fn copy_binary_to_elfs_folder(network: String) {
+    let current_dir = env::current_dir().expect("Failed to get current dir");
+    // base_dir will be /home/ozan/workspace/BitVM/
+    let base_dir = current_dir
+        .join("../..")
+        .canonicalize()
+        .expect("Failed to canonicalize base_dir");
+
+    // Create elfs directory if it doesn't exist
+    let elfs_dir = base_dir.join("prover/elfs");
+    if !elfs_dir.exists() {
+        fs::create_dir_all(&elfs_dir).expect("Failed to create elfs directory");
+        println!("cargo:warning=Created elfs directory at {:?}", elfs_dir);
+    }
+
+    // Build source path (ensure this path is correct based on risc0_build's actual output location)
+    // This path assumes a specific structure relative to the workspace root.
+    // A more robust way might be to get this path from OUT_DIR if risc0_build places it there predictably.
+    let src_path = base_dir.join("target/riscv-guest/header-chain-circuit/header-chain-guest/riscv32im-risc0-zkvm-elf/docker/header-chain-guest.bin");
+
+    if !src_path.exists() {
+        // If the source ELF from the Docker build isn't found, the copy will fail.
+        // This could indicate an issue with the guest build itself or the path construction.
+        // The Docker build log (#8 and #9) suggests the ELF is built.
+        // RISC0 build scripts often place final ELFs in OUT_DIR/{method_name}.
+        // Consider using: let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+        //                let src_path = out_dir.join("header-chain-guest"); // or "header-chain-guest.elf" / ".bin"
+        println!(
+            "cargo:warning=Source binary not found at {:?}, skipping copy. This might be the root cause if copy fails.",
+            src_path
+        );
+        // It's important to ensure src_path is correct. For now, we assume it is based on your log.
+        // If the copy fails below, investigate src_path more deeply.
+        // return; // Or panic, as subsequent steps depend on this.
+    }
+
+    // Build destination path with network prefix
+    let dest_filename = format!("{}-header-chain-guest.bin", network.to_lowercase());
+    let dest_path = elfs_dir.join(&dest_filename); // This is an absolute PathBuf
+
+    // Copy the file
+    match fs::copy(&src_path, &dest_path) {
+        Ok(_) => println!(
+            "cargo:warning=Successfully copied binary from {:?} to {:?}",
+            src_path, dest_path
+        ),
+        Err(e) => {
+            // If the copy fails, the subsequent read will definitely fail.
+            // It's crucial to handle this, e.g., by panicking to stop the build with a clear message.
+            panic!(
+                "Failed to copy binary from {:?} to {:?}: {}. Subsequent ELF read will fail.",
+                src_path, dest_path, e
+            );
+        }
+    }
+
+    // The `elf_path` string below is used as a logical identifier or for constructing paths within the prover,
+    // but it should not be used directly for fs::read from the build script's CWD.
+    let logical_elf_path_for_id = match network.as_str() {
+        "mainnet" => "prover/elfs/mainnet-header-chain-guest.bin",
+        "testnet4" => "prover/elfs/testnet4-header-chain-guest.bin",
+        "signet" => "prover/elfs/signet-header-chain-guest.bin",
+        "regtest" => "prover/elfs/regtest-header-chain-guest.bin",
+        _ => {
+            println!(
+                "cargo:warning=Invalid network specified, defaulting to mainnet for logical path"
+            );
+            "prover/elfs/mainnet-header-chain-guest.bin"
+        }
+    };
+
+    println!(
+        "cargo:warning=Logical ELF path for ID computation: {:?}",
+        logical_elf_path_for_id
+    );
+
+    // --- THIS IS THE FIX ---
+    // Read the ELF file from `dest_path`, where it was actually copied.
+    // `dest_path` is already an absolute `PathBuf`.
+    println!(
+        "cargo:warning=Attempting to read ELF file from: {:?}",
+        dest_path
+    );
+    let elf_bytes: Vec<u8> = fs::read(&dest_path) // Use &dest_path here
+        .unwrap_or_else(|e| panic!("Failed to read ELF file from {:?}: {}", dest_path, e));
+
+    let method_id = compute_image_id(elf_bytes.as_slice()).unwrap();
+    println!("cargo:warning=Computed method ID: {:x?}", method_id);
+    println!(
+        "cargo:warning=Computed method ID words: {:?}",
+        method_id.as_words()
+    );
+}
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..1cb079ad2
--- /dev/null
+++ b/header-chain/header-chain-guest/guest/Cargo.lock
@@ -0,0 +1,1432 @@
+# 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 = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[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.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-r1cs-std",
+ "ark-std",
+]
+
+[[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",
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "ark-std",
+ "blake2",
+ "derivative",
+ "digest",
+ "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.90",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "educe",
+ "fnv",
+ "hashbrown",
+ "itertools",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "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",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "arrayvec",
+ "digest",
+ "educe",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "zeroize",
+]
+
+[[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.90",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88f1d0f3a534bb54188b8dcc104307db6c56cdae574ddc3212aec0625740fc7e"
+dependencies = [
+ "ark-crypto-primitives",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "educe",
+ "fnv",
+ "hashbrown",
+]
+
+[[package]]
+name = "ark-r1cs-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-std",
+ "educe",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "tracing",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384"
+dependencies = [
+ "ark-ff",
+ "ark-std",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "arrayvec",
+ "digest",
+ "num-bigint",
+]
+
+[[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.90",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d368e2848c2d4c129ce7679a7d0d2d612b6a274d3ea6a13bad4445d61b381b88"
+dependencies = [
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
+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 = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[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 = "cobs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+
+[[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 0.2.15",
+ "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 = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[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.90",
+ "unicode-xid",
+]
+
+[[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 = "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.90",
+]
+
+[[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 = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
+[[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.90",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[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 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+]
+
+[[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 = "include_bytes_aligned"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee796ad498c8d9a1d68e477df8f754ed784ef875de1414ebdaf169f70a6a784"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[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 = "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.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "no_std_strings"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5b0c77c1b780822bc749a33e39aeb2c07584ab93332303babeabb645298a76e"
+
+[[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 = "postcard"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "serde",
+]
+
+[[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 = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[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 = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fe7599ac55ad77515608ec42a9727001559fe4f579c533cb7c973b54800c05"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "derive_more",
+ "elf",
+ "lazy_static",
+ "postcard",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "semver",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd8acfc84307ed1be64cf9fefc390963fc22b2865d027f03405977a0cfa9747"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "paste",
+ "risc0-binfmt",
+ "risc0-circuit-recursion",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd1514e94440e2da301f48d345e1937b315147f58c5dc4992feb045324651d"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "hex",
+ "metal",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23f6ed144d8b8f93c4a6096e3dd90f9dcbd91eff83eae690a72fd6e640760b94"
+dependencies = [
+ "anyhow",
+ "bit-vec",
+ "bytemuck",
+ "derive_more",
+ "paste",
+ "risc0-binfmt",
+ "risc0-core",
+ "risc0-zkp",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317bbf70a8750b64d4fd7a2bdc9d7d5f30d8bb305cae486962c797ef35c8d08e"
+dependencies = [
+ "bytemuck",
+ "bytemuck_derive",
+ "rand_core",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b31cb7b2a46f0cdaf71803ea7e0389af9f5bc1aea2531106f2972b241f26e98"
+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-zkos-v1compat"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76c479b69d1987cb54ac72dcc017197296fdcd6daf78fafc10cbbd3a167a7de"
+dependencies = [
+ "include_bytes_aligned",
+ "no_std_strings",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa210a232361fd671b30918469856b64d715f2564956d0a5df97ab6cb116d28b"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest",
+ "hex",
+ "hex-literal",
+ "metal",
+ "paste",
+ "rand_core",
+ "risc0-core",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a049319790277845335445b549d49e66341f4a7ffba7f7aaa1e77e2fc4a9c19"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "bytemuck",
+ "derive_more",
+ "getrandom 0.2.15",
+ "hex",
+ "risc0-binfmt",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core",
+ "risc0-groth16",
+ "risc0-zkos-v1compat",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "rrs-lib",
+ "semver",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm-platform"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e4de2938eaf24892ef927d9cef6e4acb6a19ce01c017cd498533896f633f332"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "getrandom 0.3.3",
+ "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 = "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"
+dependencies = [
+ "serde",
+]
+
+[[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 = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[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 = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[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 = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[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..9816b5838
--- /dev/null
+++ b/header-chain/src/header_chain.rs
@@ -0,0 +1,1074 @@
+// 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 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..b8ebceb37
--- /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.get(mmr_proof.subroot_idx) == Some(&current_hash)
+    }
+}
diff --git a/header-chain/src/mmr_native.rs b/header-chain/src/mmr_native.rs
new file mode 100644
index 000000000..b06de20a1
--- /dev/null
+++ b/header-chain/src/mmr_native.rs
@@ -0,0 +1,220 @@
+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
+    }
+}
+
+#[cfg(test)]
+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..efb8b39f9
--- /dev/null
+++ b/header-chain/src/zkvm.rs
@@ -0,0 +1,54 @@
+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..018eaa423
--- /dev/null
+++ b/prover/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "prover"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bitcoin.workspace = true
+header-chain = { path = "../header-chain" }
+final-spv = { path = "../final-spv" }
+borsh = {version = "1.5.3", features = ["derive"] }
+risc0-zkvm = {version = "2.0.2", default-features = false, features = ["prove", "client"]}
+risc0-zkp = {version = "2.0.1", default-features = false, features = ["prove"]}
+risc0-binfmt = {version = "2.0.1"}
+risc0-circuit-recursion = {version = "2.0.1"}
+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-conservative = "0.2.0"
+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..3b4888954
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.bin b/prover/elfs/mainnet-final-spv-guest.bin
new file mode 100644
index 000000000..50f95d64d
Binary files /dev/null and b/prover/elfs/mainnet-final-spv-guest.bin differ
diff --git a/prover/elfs/mainnet-header-chain-guest.bin b/prover/elfs/mainnet-header-chain-guest.bin
new file mode 100644
index 000000000..8b87a5e42
Binary files /dev/null and b/prover/elfs/mainnet-header-chain-guest.bin differ
diff --git a/prover/elfs/regtest-final-spv-guest.bin b/prover/elfs/regtest-final-spv-guest.bin
new file mode 100644
index 000000000..e071fa681
Binary files /dev/null and b/prover/elfs/regtest-final-spv-guest.bin differ
diff --git a/prover/elfs/regtest-header-chain-guest.bin b/prover/elfs/regtest-header-chain-guest.bin
new file mode 100644
index 000000000..a6f33e334
Binary files /dev/null and b/prover/elfs/regtest-header-chain-guest.bin differ
diff --git a/prover/elfs/signet-final-spv-guest.bin b/prover/elfs/signet-final-spv-guest.bin
new file mode 100644
index 000000000..54f2686ec
Binary files /dev/null and b/prover/elfs/signet-final-spv-guest.bin differ
diff --git a/prover/elfs/signet-header-chain-guest.bin b/prover/elfs/signet-header-chain-guest.bin
new file mode 100644
index 000000000..9a63e2962
Binary files /dev/null and b/prover/elfs/signet-header-chain-guest.bin differ
diff --git a/prover/elfs/testnet4-final-spv-guest.bin b/prover/elfs/testnet4-final-spv-guest.bin
new file mode 100644
index 000000000..17e10c130
Binary files /dev/null and b/prover/elfs/testnet4-final-spv-guest.bin differ
diff --git a/prover/elfs/testnet4-header-chain-guest.bin b/prover/elfs/testnet4-header-chain-guest.bin
new file mode 100644
index 000000000..95bac3573
Binary files /dev/null and b/prover/elfs/testnet4-header-chain-guest.bin differ
diff --git a/prover/src/docker.rs b/prover/src/docker.rs
new file mode 100644
index 000000000..3d47fb841
--- /dev/null
+++ b/prover/src/docker.rs
@@ -0,0 +1,183 @@
+use hex_conservative::{DisplayHex, FromHex};
+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.to_lower_hex_string();
+    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 mut 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);
+    // remove 248th and 249th bits
+    id_bn254_fr_bits.remove(248);
+    id_bn254_fr_bits.remove(248);
+
+    println!(
+        "id_bn254_fr_bits after removing 2 extra 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("--platform=linux/amd64") // Force linux/amd64 platform
+        .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();
+    println!("output content: {:?}", output_content_dec);
+    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 = Vec::from_hex(&output_content_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..4bb2e18d0
--- /dev/null
+++ b/prover/src/lib.rs
@@ -0,0 +1,260 @@
+use borsh::BorshDeserialize;
+use header_chain::header_chain::{
+    BlockHeaderCircuitOutput, CircuitBlockHeader, HeaderChainCircuitInput, HeaderChainPrevProofType,
+};
+use 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.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => {
+            include_bytes!("../elfs/testnet4-header-chain-guest.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"signet") => {
+            include_bytes!("../elfs/signet-header-chain-guest.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"regtest") => {
+            include_bytes!("../elfs/regtest-header-chain-guest.bin")
+        }
+        None => include_bytes!("../elfs/mainnet-header-chain-guest.bin"),
+        _ => 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
+}
+#[cfg(test)]
+mod tests {
+    use bitcoin::hex::FromHex;
+    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.bin");
+        let header_chain_circuit_elf = include_bytes!("../elfs/mainnet-header-chain-guest.bin");
+        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(&Vec::<u8>::from_hex("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000").unwrap()).unwrap());
+        let block_header: CircuitBlockHeader = CircuitBlockHeader::try_from_slice(Vec::<u8>::from_hex("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 hasher = blake3::Hasher::new();
+        hasher.update(&constants_digest);
+        hasher.update(&journal);
+        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..e3d04c565
--- /dev/null
+++ b/prover/src/main.rs
@@ -0,0 +1,5 @@
+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/inv.rs b/src/bigint/inv.rs
deleted file mode 100644
index 714ff6d53..000000000
--- a/src/bigint/inv.rs
+++ /dev/null
@@ -1,507 +0,0 @@
-use crate::bigint::BigIntImpl;
-use crate::pseudo::OP_NDUP;
-use crate::treepp::*;
-use core::ops::{Mul, Rem, Sub};
-use num_bigint::BigUint;
-use num_traits::Num;
-
-impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
-    pub fn div2() -> Script {
-        script! {
-            { Self::div2rem() }
-            OP_DROP
-        }
-    }
-
-    pub fn div2rem() -> Script {
-        script! {
-            { Self::N_LIMBS - 1 } OP_ROLL
-            0
-            { limb_shr1_carry(Self::HEAD) }
-
-            for _ in 1..Self::N_LIMBS {
-                { Self::N_LIMBS } OP_ROLL
-                OP_SWAP
-                { limb_shr1_carry(LIMB_SIZE) }
-            }
-        }
-    }
-
-    pub fn div3() -> Script {
-        script! {
-            { Self::div3rem() }
-            OP_DROP
-        }
-    }
-
-    pub fn div3rem() -> Script {
-        script! {
-            { Self::N_LIMBS - 1 } OP_ROLL
-            0
-            { limb_div3_carry(Self::HEAD) }
-
-            for _ in 1..Self::N_LIMBS {
-                { Self::N_LIMBS } OP_ROLL
-                OP_SWAP
-                { limb_div3_carry(LIMB_SIZE) }
-            }
-        }
-    }
-
-    /// Input: a b
-    ///  a is the modulus
-    ///  b is the number
-    ///
-    /// The algorithm is from Constant Time Modular Inversion, Joppe W. Bos
-    pub fn inv_stage1() -> Script {
-        script! {
-            { Self::push_zero() }
-            { Self::roll(1) }
-            { Self::push_one() }
-            { Self::N_BITS } OP_NEGATE
-
-            // The stack starts with
-            //  u    N elements
-            //  r    N elements
-            //  v    N elements
-            //  s    N elements
-            //  k    1 element
-
-            // send k to the altstack
-            OP_TOALTSTACK
-
-            // stack invariant for this loop: u, r, v, s | k
-            for _ in 0..2 * Self::N_BITS {
-                // copy u, v
-                { Self::copy(3) }
-                { Self::copy(2) }
-
-                // check if u = v
-                { Self::notequal(1, 0)}
-
-                // if the algorithm has not terminated (u != v)
-                OP_IF
-                    // compute 2 * s
-                    { Self::copy(0) }
-                    { Self::double(0) }
-
-                    // compute 2 * r
-                    { Self::copy(3) }
-                    { Self::double(0) }
-
-                    // compute u/2
-                    { Self::copy(5) }
-                    { Self::div2rem() }
-
-                    // current stack: u, r, v, s, 2 * s, 2 * r, u/2
-
-                    // case 1: u = 0 mod 2
-                    OP_NOTIF
-                        // start stack: u, r, v, s, 2 * s, 2 * r, u/2 | k
-
-                        // roll the 2 * s
-                        { Self::roll(2) }
-                        { Self::toaltstack() }
-
-                        // roll the v
-                        { Self::roll(3) }
-                        { Self::toaltstack() }
-
-                        // roll the r
-                        { Self::roll(3) }
-                        { Self::toaltstack() }
-                        { Self::toaltstack() }
-
-                        // remove the unused 2 * r
-                        { Self::drop() }
-
-                        // remove the unused s
-                        { Self::drop() }
-
-                        // remove the unused u
-                        { Self::drop() }
-
-                        { Self::fromaltstack() }
-                        { Self::fromaltstack() }
-                        { Self::fromaltstack() }
-                        { Self::fromaltstack() }
-                        // final stack: u/2, r, v, 2 * s | k
-                    OP_ELSE
-                        // compute v/2
-                        { Self::copy(4) }
-                        { Self::div2rem() }
-
-                        // case 2: v = 0 mod 2
-                        OP_NOTIF
-                            // 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() }
-
-                            // remove the unused 2 * s
-                            { Self::drop() }
-                            { Self::toaltstack() }
-
-                            // remove the unused v
-                            { Self::drop() }
-
-                            // remove the unused r
-                            { Self::drop() }
-
-                            { Self::fromaltstack() }
-                            { Self::fromaltstack() }
-                            { Self::fromaltstack() }
-                            { Self::roll(2) }
-
-                            // final stack: u, 2 * r, v/2, s | k
-                        OP_ELSE
-                            // copy u, v
-                            { Self::copy(7) }
-                            { Self::copy(6) }
-
-                            // compute u > v
-                            { Self::greaterthan(1, 0) }
-
-                            // reorder u/2 and v/2 if u < v
-                            OP_DUP OP_TOALTSTACK
-                            OP_NOTIF
-                                { Self::roll(1) }
-                            OP_ENDIF
-
-                            // compute (u - v)/2 (if u > v) or (v - u)/2 (if v > u)
-                            { Self::sub(1, 0) }
-
-                            // compute r + s
-                            { Self::roll(5) }
-                            { Self::roll(4) }
-                            { Self::add(1, 0) }
-
-                            OP_FROMALTSTACK
-
-                            // case 3: u > v
-                            OP_IF
-                                // start stack: u, v, 2 * s, 2 * r, (u/2 - v/2), r + s | k
-
-                                // roll the v
-                                { Self::roll(4) }
-
-                                // roll the 2 * s
-                                { Self::roll(4) }
-
-                                // remove the unused u
-                                { Self::roll(5) }
-                                { Self::drop() }
-
-                                // remove the unused 2 * r
-                                { Self::roll(4) }
-                                { Self::drop() }
-
-                                // 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() }
-
-                                // remove the unused 2 * s
-                                { Self::roll(3) }
-                                { Self::drop() }
-
-                                // final stack: u, 2 * r, (v/2 - u/2), r + s | k
-                            OP_ENDIF
-                        OP_ENDIF
-                    OP_ENDIF
-
-                    // increase k
-                    OP_FROMALTSTACK
-                    OP_1ADD
-                    OP_TOALTSTACK
-                OP_ENDIF
-            }
-
-            { Self::toaltstack() }
-            { Self::drop() }
-            { Self::drop() }
-            { Self::drop() }
-            { Self::fromaltstack() }
-            OP_FROMALTSTACK
-
-            // final stack: s k
-        }
-    }
-
-    pub fn inv_stage2(modulus_hex: &str) -> Script {
-        let modulus = BigUint::from_str_radix(modulus_hex, 16).unwrap();
-
-        let inv_2 = BigUint::from(2u8).modpow(&modulus.clone().sub(BigUint::from(2u8)), &modulus);
-        let inv_2k = inv_2.modpow(&BigUint::from(Self::N_BITS), &modulus);
-
-        let mut inv_list = vec![];
-        let mut cur = inv_2k;
-        for _ in 0..=Self::N_BITS {
-            inv_list.push(cur.clone());
-            cur = cur.mul(&inv_2).rem(&modulus);
-        }
-
-        script! {
-            { OP_NDUP(Self::N_BITS as usize) }
-            for i in 0..=Self::N_BITS {
-                { Self::N_BITS - i } OP_EQUAL OP_TOALTSTACK
-            }
-            { script! {
-                for i in 0..=Self::N_BITS {
-                    OP_FROMALTSTACK OP_IF
-                        { Self::push_u32_le(&inv_list[i as usize].to_u32_digits()) }
-                    OP_ENDIF
-                }
-            }.add_stack_hint(0, 9).add_altstack_hint(-(Self::N_BITS as i32) - 1, -(Self::N_BITS as i32) - 1)}
-        }
-    }
-}
-
-pub fn limb_shr1_carry(num_bits: u32) -> Script {
-    let powers_of_2_script = if num_bits < 7 {
-        script! {
-            for i in 0..num_bits - 1 {
-                { 2_u32.pow(i) }
-            }
-        }
-    } else {
-        script! {
-            2 4 8 16 32 64              // 2^1 to 2^6
-            for _ in 0..num_bits - 7 {
-                OP_DUP OP_DUP OP_ADD
-            }                           // 2^7 to 2^{num_bits - 1}
-        }
-    };
-
-    script! {
-        { powers_of_2_script }
-        { num_bits - 1 } OP_ROLL
-        OP_IF
-            OP_DUP
-        OP_ELSE
-            0
-        OP_ENDIF
-        OP_TOALTSTACK
-
-        { num_bits - 1 } OP_ROLL
-
-        for _ in 0..num_bits - 2 {
-            OP_2DUP OP_LESSTHANOREQUAL
-            OP_IF
-                OP_SWAP OP_SUB OP_SWAP OP_DUP OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_SWAP
-            OP_ELSE
-                OP_NIP
-            OP_ENDIF
-        }
-
-        OP_2DUP OP_LESSTHANOREQUAL
-        OP_IF
-            OP_SWAP OP_SUB OP_FROMALTSTACK OP_1ADD
-        OP_ELSE
-            OP_NIP OP_FROMALTSTACK
-        OP_ENDIF
-        OP_SWAP
-    }
-}
-
-// divide limb by 3, also remainder
-pub fn limb_div3_carry(limb_size: u32) -> Script {
-    let max_limb = (1 << limb_size) as i64;
-
-    let x_quotient = max_limb / 3;
-    let x_remainder = max_limb % 3;
-
-    let y_quotient = max_limb * 2 / 3;
-    let y_remainder = max_limb * 2 % 3;
-
-    let mut k = 0;
-    let mut cur = 1;
-    while cur < max_limb {
-        k += 1;
-        cur *= 3;
-    }
-
-    script! {
-        1 2 3 6 9 18 27 54
-        for _ in 0..k - 4 {
-            OP_2DUP OP_ADD
-            OP_DUP OP_DUP OP_ADD
-        }
-
-        { 2 * k } OP_ROLL OP_DUP
-        0 OP_GREATERTHAN
-        OP_IF
-            OP_1SUB
-            OP_IF
-                { y_remainder } { y_quotient }
-            OP_ELSE
-                { x_remainder } { x_quotient }
-            OP_ENDIF
-        OP_ELSE
-            0
-        OP_ENDIF
-        OP_TOALTSTACK
-
-        { 2 * k + 1 } OP_ROLL OP_ADD
-
-        for _ in 0..2 * k - 2 {
-            OP_2DUP OP_LESSTHANOREQUAL
-            OP_IF
-                OP_SWAP OP_SUB 2 OP_PICK OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-            OP_ELSE
-                OP_NIP
-            OP_ENDIF
-        }
-
-        OP_NIP OP_NIP OP_FROMALTSTACK OP_SWAP
-    }
-}
-
-#[cfg(test)]
-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};
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_limb_shr1_carry() {
-        println!("limb_shr1_carry: {} bytes", limb_shr1_carry(29).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..100 {
-            let mut a: u32 = prng.gen();
-            a %= 1 << 29;
-
-            let script = script! {
-                { a }
-                { 0 }
-                { limb_shr1_carry(29) }
-                { a & 1 } OP_EQUALVERIFY
-                { a >> 1 } OP_EQUAL
-            };
-
-            run(script);
-        }
-
-        for _ in 0..100 {
-            let mut a: u32 = prng.gen();
-            a %= 1 << 29;
-
-            let script = script! {
-                { a }
-                { 1 }
-                { limb_shr1_carry(29) }
-                { a & 1 } OP_EQUALVERIFY
-                { (1 << 28) | (a >> 1) } OP_EQUAL
-            };
-
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_limb_div3_carry() {
-        println!("limb_div3_carry: {} bytes", limb_div3_carry(29).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..100 {
-            let mut a: u32 = prng.gen();
-            a %= 1 << 29;
-            let k = 2_u32.pow(29);
-
-            for r in 0..3 {
-                let a2 = a + r * k;
-                let b = a2 % 3;
-                let c = a2 / 3;
-                let script = script! {
-                    { a }
-                    { r }
-                    { limb_div3_carry(29) }
-                    { b } OP_EQUALVERIFY
-                    { c } OP_EQUAL
-                };
-
-                run(script);
-            }
-        }
-    }
-
-    #[test]
-    fn test_div2() {
-        println!("U254.div2: {} bytes", U254::div2().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().shr(1);
-
-            let script = script! {
-                { U254::push_u32_le(&a.to_u32_digits()) }
-                { U254::div2() }
-                { U254::push_u32_le(&c.to_u32_digits()) }
-                { U254::equalverify(1, 0) }
-                OP_TRUE
-            };
-            run(script);
-        }
-
-        for _ in 0..100 {
-            let a: BigUint = prng.sample(RandomBits::new(64));
-            let c: BigUint = a.clone().shr(1);
-
-            let script = script! {
-                { U64::push_u32_le(&a.to_u32_digits()) }
-                { U64::div2() }
-                { U64::push_u32_le(&c.to_u32_digits()) }
-                { U64::equalverify(1, 0) }
-                OP_TRUE
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_div3() {
-        println!("U254.div3: {} bytes", U254::div3().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().div(BigUint::from(3_u32));
-
-            let script = script! {
-                { U254::push_u32_le(&a.to_u32_digits()) }
-                { U254::div3() }
-                { U254::push_u32_le(&c.to_u32_digits()) }
-                { U254::equalverify(1, 0) }
-                OP_TRUE
-            };
-            run(script);
-        }
-
-        for _ in 0..100 {
-            let a: BigUint = prng.sample(RandomBits::new(64));
-            let c: BigUint = a.clone().div(BigUint::from(3_u32));
-
-            let script = script! {
-                { U64::push_u32_le(&a.to_u32_digits()) }
-                { U64::div3() }
-                { U64::push_u32_le(&c.to_u32_digits()) }
-                { U64::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let stack = script.clone().analyze_stack();
-            assert!(stack.is_valid_final_state_without_inputs());
-            run(script);
-        }
-    }
-}
diff --git a/src/bigint/std.rs b/src/bigint/std.rs
deleted file mode 100644
index 9c02de714..000000000
--- a/src/bigint/std.rs
+++ /dev/null
@@ -1,551 +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
-            }
-        }.add_stack_hint(-(Self::N_LIMBS as i32), Self::N_LIMBS as i32)
-    }
-
-    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);
-
-        if n_limbs_target == n_limbs_self {
-            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::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
-        });
-    }
-}
diff --git a/src/bigint/u29x9.rs b/src/bigint/u29x9.rs
deleted file mode 100644
index f17c6570f..000000000
--- a/src/bigint/u29x9.rs
+++ /dev/null
@@ -1,2697 +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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[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
-        };
-
-        run(script);
-    }
-
-    #[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
-        };
-
-        run(script);
-    }
-
-    #[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
-        };
-
-        run(script);
-    }
-
-    #[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
-        };
-
-        run(script);
-    }
-}
diff --git a/src/bigint/u32x8.rs b/src/bigint/u32x8.rs
deleted file mode 100644
index a43979844..000000000
--- a/src/bigint/u32x8.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-
-use crate::treepp::*;
-
-// x₀ → (x₀+1)%2³²
-pub fn u32_1add_nocarry() -> Script {
-    script! {
-        // ⋯ x₀
-        OP_SIZE OP_5 OP_EQUAL
-        // ⋯ x₀ x₀=2³¹
-        OP_IF OP_DROP 0x7FFFFFFF OP_NEGATE
-        // ⋯ 1-2³¹
-        OP_ELSE OP_1ADD OP_ENDIF
-        // ⋯ x₀+1
-    }
-}
-
-// x₀ → (x₀+1)%2³² x₀=-1
-pub fn u32_1add_carry() -> Script {
-    script! {
-        // ⋯ x₀
-        OP_SIZE OP_5 OP_EQUAL
-        // ⋯ x₀ x₀=2³¹
-        OP_IF OP_DROP 0x7FFFFFFF OP_NEGATE
-        // ⋯ 1-2³¹
-        OP_ELSE OP_1ADD OP_ENDIF
-        // ⋯ x₀+1
-        OP_DUP OP_0 OP_EQUAL
-        // ⋯ x₀+1 x₀=-1
-    }
-}
-
-// 2³¹-1 x₀ x₁ → 2³¹-1 (x₀+x₁)%2³²
-pub fn u32_add_nocarry() -> Script {
-    script! {
-        // ⋯ 2³¹-1 x₀ x₁
-        OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₀ x₁ x₁=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_TUCK OP_GREATERTHAN
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁
-            OP_TUCK OP_IF OP_3 OP_PICK OP_ADD OP_1ADD OP_ENDIF
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[+2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[+2³¹]
-        OP_ROT OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀ x₀=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ x₀
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ x₀
-            OP_TUCK OP_LESSTHAN
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀ x₀<2³¹
-            OP_TUCK OP_IF OP_4 OP_PICK OP_SUB OP_1SUB OP_ENDIF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀<2³¹ x₀[-2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀≤2³¹ x₀[-2³¹]
-        OP_ROT OP_ADD
-        // ⋯ 2³¹-1 x₁≥2³¹ x₀≤2³¹ x₀+x₁[±2³¹]
-        OP_ROT OP_ROT OP_NUMNOTEQUAL
-        // ⋯ 2³¹-1 x₀+x₁[±2³¹] (x₀≤2³¹)≠(x₁≥2³¹)
-        OP_IF //  x₀≤2³¹ ≠ x₁≥2³¹
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹]
-            OP_2DUP OP_0 OP_LESSTHANOREQUAL
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥2³¹
-            OP_IF OP_ADD OP_1ADD OP_ELSE OP_SUB OP_1SUB OP_ENDIF
-            // ⋯ 2³¹-1 (x₀+x₁)%2³²
-        OP_ENDIF
-        // ⋯ 2³¹-1 (x₀+x₁)%2³²
-    }
-}
-
-// 2³¹-1 x₀ x₁ → 2³¹-1 (x₀+x₁)%2³² x₀+x₁≥2³²
-pub fn u32_add_carry() -> Script {
-    script! {
-        // ⋯ 2³¹-1 x₀ x₁
-        OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₀ x₁ x₁=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_TUCK OP_LESSTHAN
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁
-            OP_TUCK OP_IF OP_3 OP_PICK OP_SUB OP_1SUB OP_ENDIF
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[-2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[-2³¹]
-        OP_ROT OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀ x₀=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀=2³¹ x₀
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀=2³¹ x₀
-            OP_TUCK OP_GREATERTHAN
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀ x₀<2³¹
-            OP_TUCK OP_IF OP_4 OP_PICK OP_ADD OP_1ADD OP_ENDIF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀<2³¹ x₀[+2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[-2³¹] x₀≤2³¹ x₀[+2³¹]
-        OP_ROT OP_DUP OP_0NOTEQUAL OP_TOALTSTACK OP_ADD
-        // ⋯ 2³¹-1 x₁≥2³¹ x₀≤2³¹ x₀+x₁[±2³¹] | x₁[-2³¹]≠0
-        OP_DUP OP_2OVER OP_NUMNOTEQUAL OP_GREATERTHANOREQUAL
-        // ⋯ 2³¹-1 x₁≥2³¹ x₀≤2³¹ x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) | x₁[-2³¹]≠0
-        OP_2SWAP OP_TUCK OP_NUMNOTEQUAL
-        // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) x₁≥2³¹ x₀≤2³¹ | x₁[-2³¹]≠0
-        OP_FROMALTSTACK OP_SWAP
-        // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) x₁≥2³¹ x₁[-2³¹]≠0 x₀≤2³¹
-        OP_IF // x₀ ≤ 2³¹
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) x₁≥2³¹ x₁[-2³¹]≠0
-            OP_BOOLAND
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) x₁≥2³¹∧x₁[-2³¹]≠0
-            OP_3 OP_PICK OP_2SWAP
-            // ⋯ 2³¹-1 x₁≥2³¹∧x₁[-2³¹]≠0 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹)
-            OP_IF // x₀+x₁[±2³¹] ≥ (x₀≤2³¹)≠(x₁≥2³¹)
-                // ⋯ 2³¹-1 x₁≥2³¹∧x₁[-2³¹]≠0 2³¹-1 x₀+x₁[±2³¹]
-                OP_1SUB OP_SWAP OP_SUB
-                // ⋯ 2³¹-1 x₁≥2³¹∧x₁[-2³¹]≠0 x₀+x₁[±2³¹]-2³¹
-            OP_ELSE
-                // ⋯ 2³¹-1 x₁≥2³¹∧x₁[-2³¹]≠0 2³¹-1 x₀+x₁[±2³¹]
-                OP_1ADD OP_ADD
-                // ⋯ 2³¹-1 x₁≥2³¹∧x₁[-2³¹]≠0 x₀+x₁[±2³¹]+2³¹
-            OP_ENDIF
-            // ⋯ 2³¹-1 x₀+x₁≥2³² (x₀+x₁)%2³²
-            OP_SWAP
-            // ⋯ 2³¹-1 (x₀+x₁)%2³² x₀+x₁≥2³²
-        OP_ELSE // x₁[-2³¹] = 0
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹) x₁≥2³¹ x₁[-2³¹]≠0
-            OP_BOOLOR OP_BOOLAND
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥(x₀≤2³¹)≠(x₁≥2³¹)∨x₁≥2³¹∧x₁[-2³¹]≠0
-        OP_ENDIF
-        // ⋯ 2³¹-1 (x₀+x₁)%2³² x₀+x₁≥2³²
-    }
-}
-
-// 2³¹-1 x₀ x₁ → 2³¹-1 (x₀-x₁)%2³²
-pub fn u32_sub_noborrow() -> Script {
-    script! {
-        // ⋯ 2³¹-1 x₀ x₁
-        OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₀ x₁ x₁=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₀ x₁=2³¹ x₁
-            OP_TUCK OP_GREATERTHAN
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁
-            OP_TUCK OP_IF OP_3 OP_PICK OP_ADD OP_1ADD OP_ENDIF
-            // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[+2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₀ x₁≥2³¹ x₁[+2³¹]
-        OP_ROT OP_SIZE OP_5 OP_EQUAL
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀ x₀=2³¹
-        OP_TUCK OP_IF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ x₀
-            OP_DROP OP_0
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ 0
-        OP_ELSE
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀=2³¹ x₀
-            OP_TUCK OP_LESSTHAN
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀ x₀<2³¹
-            OP_TUCK OP_IF OP_4 OP_PICK OP_SUB OP_1SUB OP_ENDIF
-            // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀<2³¹ x₀[-2³¹]
-        OP_ENDIF
-        // ⋯ 2³¹-1 x₁≥2³¹ x₁[+2³¹] x₀≤2³¹ x₀[-2³¹]
-        OP_ROT OP_SUB
-        // ⋯ 2³¹-1 x₁≥2³¹ x₀≤2³¹ x₀+x₁[±2³¹]
-        OP_ROT OP_ROT OP_NUMNOTEQUAL
-        // ⋯ 2³¹-1 x₀+x₁[±2³¹] (x₀≤2³¹)≠(x₁≥2³¹)
-        OP_IF //  x₀≤2³¹ ≠ x₁≥2³¹
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹]
-            OP_2DUP OP_0 OP_LESSTHANOREQUAL
-            // ⋯ 2³¹-1 x₀+x₁[±2³¹] x₀+x₁[±2³¹]≥2³¹
-            OP_IF OP_ADD OP_1ADD OP_ELSE OP_SUB OP_1SUB OP_ENDIF
-            // ⋯ 2³¹-1 (x₀+x₁)%2³²
-        OP_ENDIF
-        // ⋯ 2³¹-1 (x₀+x₁)%2³²
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    #[test]
-    fn test_1add_nocarry() {
-        println!("u32_1add_nocarry: {} bytes", u32_1add_nocarry().len());
-        run(script! {
-            0 u32_1add_nocarry 1 OP_EQUALVERIFY // 0 + 1 ⩵ 1 mod 2³²
-            0x7FFFFFFF u32_1add_nocarry 0x80000000 OP_EQUALVERIFY // 2³¹-1 + 1 ⩵ 1 mod 2³²
-            0x80000000 u32_1add_nocarry 0x7FFFFFFF OP_NEGATE OP_EQUALVERIFY // 2³¹ + 1 ⩵ 2³¹+1 mod 2³²
-            0x7FFFFFFF OP_NEGATE u32_1add_nocarry 0x7FFFFFFE OP_NEGATE OP_EQUALVERIFY // 2³¹+1 + 1 ⩵ 2³¹+2 mod 2³²
-            1 OP_NEGATE u32_1add_nocarry 0 OP_EQUALVERIFY // 2³²-1 + 1 ⩵ 0 mod 2³²
-            OP_TRUE
-        })
-    }
-    #[test]
-    fn test_1add_carry() {
-        println!("u32_1add_carry: {} bytes", u32_1add_carry().len());
-        run(script! {
-            0 u32_1add_carry 0 OP_EQUALVERIFY 1 OP_EQUALVERIFY // 0 + 1 ⩵ 1 mod 2³²
-            0x7FFFFFFF u32_1add_carry 0 OP_EQUALVERIFY 0x80000000 OP_EQUALVERIFY // 2³¹-1 + 1 ⩵ 2³¹ mod 2³²
-            0x7FFFFFFF OP_NEGATE u32_1add_carry 0 OP_EQUALVERIFY 0x7FFFFFFE OP_NEGATE OP_EQUALVERIFY
-            1 OP_NEGATE u32_1add_carry 1 OP_EQUALVERIFY 0 OP_EQUALVERIFY // 2³²-1 + 1 ⩵ 0 mod 2³²
-            OP_TRUE
-        })
-    }
-    #[test]
-    fn test_add_nocarry() {
-        println!("u32_add_nocarry: {} bytes", u32_add_nocarry().len());
-        run(script! { 0x7FFFFFFF
-            0 0 u32_add_nocarry 0 OP_EQUALVERIFY // 0 + 0 ⩵ 0 mod 2³²
-            1 0 u32_add_nocarry 1 OP_EQUALVERIFY // 1 + 0 ⩵ 1 mod 2³²
-            0 1 u32_add_nocarry 1 OP_EQUALVERIFY // 0 + 1 ⩵ 1 mod 2³²
-            1 1 u32_add_nocarry 2 OP_EQUALVERIFY // 1 + 1 ⩵ 2 mod 2³²
-            0x40000000 OP_DUP u32_add_nocarry 0x80000000 OP_EQUALVERIFY // 2³⁰ + 2³⁰ ⩵ 2³¹ mod 2³²
-            0 0x80000000 u32_add_nocarry 0x80000000 OP_EQUALVERIFY // 0 + 2³¹ ⩵ 2³¹ mod 2³²
-            0x80000000 0 u32_add_nocarry 0x80000000 OP_EQUALVERIFY // 2³¹ + 0 ⩵ 2³¹ mod 2³²
-            0x80000000 OP_DUP u32_add_nocarry 0 OP_EQUALVERIFY // 2³¹ + 2³¹ ⩵ 0 mod 2³²
-            1 OP_NEGATE 1 u32_add_nocarry 0 OP_EQUALVERIFY // 2³²-1 + 1 ⩵ 0 mod 2³²
-            1 OP_NEGATE OP_DUP u32_add_nocarry 2 OP_NEGATE OP_EQUALVERIFY // 2³²-1 + 2³²-1 ⩵ 2³²-2 mod 2³²
-            0x7FFFFFFF OP_NEGATE 0x80000000 u32_add_nocarry 1 OP_EQUALVERIFY // 2³¹+1 + 2³¹ = 1 mod 2³²
-        })
-    }
-    #[test]
-    fn test_sub_noborrow() {
-        println!("u32_sub_noborrow: {} bytes", u32_sub_noborrow().len());
-        run(script! { 0x7FFFFFFF
-            0 0 u32_sub_noborrow 0 OP_EQUALVERIFY // 0 - 0 ⩵ 0 mod 2³²
-            1 0 u32_sub_noborrow 1 OP_EQUALVERIFY // 1 - 0 ⩵ 1 mod 2³²
-            0 1 u32_sub_noborrow 1 OP_NEGATE OP_EQUALVERIFY // 0 - 1 ⩵ 2³²-1 mod 2³²
-            1 1 u32_sub_noborrow 0 OP_EQUALVERIFY // 1 - 1 ⩵ 0 mod 2³²
-            0x40000000 OP_DUP u32_sub_noborrow 0 OP_EQUALVERIFY // 2³⁰ - 2³⁰ ⩵ 0 mod 2³²
-            0 0x80000000 u32_sub_noborrow 0x80000000 OP_EQUALVERIFY // 0 - 2³¹ ⩵ 2³¹ mod 2³²
-            0x80000000 0 u32_sub_noborrow 0x80000000 OP_EQUALVERIFY // 2³¹ - 0 ⩵ 2³¹ mod 2³²
-            0x80000000 OP_DUP u32_sub_noborrow 0 OP_EQUALVERIFY // 2³¹ - 2³¹ ⩵ 0 mod 2³²
-            1 OP_NEGATE 1 u32_sub_noborrow 2 OP_NEGATE OP_EQUALVERIFY // 2³²-1 - 1 ⩵ 2³²-2 mod 2³²
-            1 OP_NEGATE OP_DUP u32_sub_noborrow 0 OP_EQUALVERIFY // 2³²-1 - 2³²-1 ⩵ 0 mod 2³²
-            0x7FFFFFFF OP_NEGATE 0x80000000 u32_sub_noborrow 1 OP_EQUALVERIFY // 2³¹+1 - 2³¹ = 1 mod 2³²
-        })
-    }
-    #[test]
-    fn test_add_carry() {
-        println!("u32_add_carry: {} bytes", u32_add_carry().len());
-        run(script! { 0x7FFFFFFF
-            0 0 u32_add_carry 0 OP_EQUALVERIFY 0 OP_EQUALVERIFY // 0 + 0 ⩵ 0 mod 2³²
-            1 0 u32_add_carry 0 OP_EQUALVERIFY 1 OP_EQUALVERIFY // 1 + 0 ⩵ 1 mod 2³²
-            0 1 u32_add_carry 0 OP_EQUALVERIFY 1 OP_EQUALVERIFY // 0 + 1 ⩵ 1 mod 2³²
-            1 1 u32_add_carry 0 OP_EQUALVERIFY 2 OP_EQUALVERIFY // 1 + 1 ⩵ 2 mod 2³²
-            0x40000000 OP_DUP u32_add_carry 0 OP_EQUALVERIFY 0x80000000 OP_EQUALVERIFY // 2³⁰ + 2³⁰ ⩵ 2³¹ mod 2³²
-            OP_0 0x80000000 u32_add_carry 0 OP_EQUALVERIFY 0x80000000 OP_EQUALVERIFY // 0 + 2³¹ ⩵ 2³¹ mod 2³²
-            0x80000000 OP_0 u32_add_carry 0 OP_EQUALVERIFY 0x80000000 OP_EQUALVERIFY // 2³¹ + 0 ⩵ 2³¹ mod 2³²
-            0x80000000 OP_DUP u32_add_carry 1 OP_EQUALVERIFY 0 OP_EQUALVERIFY // 2³¹ + 2³¹ ⩵ 0 mod 2³²
-            1 OP_NEGATE 1 u32_add_carry 1 OP_EQUALVERIFY 0 OP_EQUALVERIFY // 2³²-1 + 1 ⩵ 0 mod 2³²
-            1 OP_NEGATE OP_DUP u32_add_carry 1 OP_EQUALVERIFY 2 OP_NEGATE OP_EQUALVERIFY // 2³²-1 + 2³²-1 ⩵ 2³²-2 mod 2³²
-            0x7FFFFFFF OP_NEGATE 0x80000000 u32_add_carry 1 OP_EQUALVERIFY 1 OP_EQUALVERIFY // 2³¹+1 + 2³¹ = 1 mod 2³²
-        })
-    }
-}
diff --git a/src/bn254/curves.rs b/src/bn254/curves.rs
deleted file mode 100644
index ce8cb11b3..000000000
--- a/src/bn254/curves.rs
+++ /dev/null
@@ -1,3242 +0,0 @@
-use ark_ec::{AffineRepr, CurveGroup};
-use ark_ff::{AdditiveGroup, BigInteger, Field, PrimeField};
-use num_bigint::BigUint;
-
-use crate::bigint::U254;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fq2::Fq2;
-use crate::bn254::fr::Fr;
-use crate::bn254::utils::{fq2_push_not_montgomery, fq_push};
-use crate::treepp::{script, Script};
-use std::cmp::min;
-use std::sync::OnceLock;
-
-use super::utils::Hint;
-
-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 push_not_montgomery(element: ark_bn254::G1Projective) -> Script {
-        script! {
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(element.x).to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(element.y).to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&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 hinted_nonzero_double(a: ark_bn254::G1Projective) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        let (hinted_script1, hint1) = Fq::hinted_square(a.x);
-        let (hinted_script2, hint2) = Fq::hinted_square(a.y);
-        let (hinted_script3, hint3) = Fq::hinted_square(a.y.square());
-        let (hinted_script4, hint4) = Fq::hinted_square(a.x + a.y.square());
-        let three_x2 = a.x.square().double() + a.x.square();
-        let (hinted_script5, hint5) = Fq::hinted_square(three_x2);
-        let xy2 = a.x * a.y.square();
-        let twelve_xy2 = xy2.double().double().double() + xy2.double().double();
-        let nine_x4 = a.x.square().square().double().double().double() + a.x.square().square();
-        let (hinted_script6, hint6) = Fq::hinted_mul(1, twelve_xy2 - nine_x4, 0, three_x2);
-        let (hinted_script7, hint7) = Fq::hinted_mul(1, a.y, 0, a.z);
-
-        let script_lines = vec![
-            // x, y, z
-            Fq::copy(2),
-            // x, y, z, x
-            hinted_script1,
-            // x, y, z, x^2
-            Fq::copy(2),
-            // x, y, z, x^2, y
-            hinted_script2,
-            // x, y, z, x^2, y^2
-            Fq::copy(0),
-            // x, y, z, x^2, y^2, y^2
-            hinted_script3,
-            // x, y, z, x^2, y^2, y^4
-            Fq::add(5, 1),
-            // y, z, x^2, y^4, x+y^2
-            hinted_script4,
-            // y, z, x^2, y^4, (x+y^2)^2
-            Fq::copy(1),
-            // y, z, x^2, y^4, (x+y^2)^2, y^4
-            Fq::sub(1, 0),
-            // y, z, x^2, y^4, x^2+2xy^2
-            Fq::copy(2),
-            // y, z, x^2, y^4, x^2+2xy^2, x^2
-            Fq::sub(1, 0),
-            // y, z, x^2, y^4, 2xy^2
-            Fq::double(0),
-            // y, z, x^2, y^4, 4xy^2
-            Fq::copy(2),
-            // y, z, x^2, y^4, 4xy^2, x^2
-            Fq::double(0),
-            // y, z, x^2, y^4, 4xy^2, 2x^2
-            Fq::add(3, 0),
-            // y, z, y^4, 4xy^2, 3x^2
-            Fq::copy(0),
-            // y, z, y^4, 4xy^2, 3x^2, 3x^2
-            hinted_script5,
-            // y, z, y^4, 4xy^2, 3x^2, 9x^4
-            Fq::copy(2),
-            // y, z, y^4, 4xy^2, 3x^2, 9x^4, 4xy^2
-            Fq::double(0),
-            // y, z, y^4, 4xy^2, 3x^2, 9x^4, 8xy^2
-            Fq::sub(1, 0),
-            // y, z, y^4, 4xy^2, 3x^2, 9x^4-8xy^2
-            Fq::copy(0),
-            // y, z, y^4, 4xy^2, 3x^2, 9x^4-8xy^2, 9x^4-8xy^2
-            Fq::sub(3, 0),
-            // y, z, y^4, 3x^2, 9x^4-8xy^2, 12xy^2-9x^4
-            Fq::roll(2),
-            // y, z, y^4, 9x^4-8xy^2, 12xy^2-9x^4, 3x^2
-            hinted_script6,
-            // y, z, y^4, 9x^4-8xy^2, 3x^2(12xy^2-9x^4)
-            Fq::double(2),
-            // y, z, 9x^4-8xy^2, 3x^2(12xy^2-9x^4), 2y^4
-            Fq::double(0),
-            Fq::double(0),
-            // y, z, 9x^4-8xy^2, 3x^2(12xy^2-9x^4), 8y^4
-            Fq::sub(1, 0),
-            // y, z, 9x^4-8xy^2, 3x^2(12xy^2-9x^4)-8y^4
-            Fq::roll(2),
-            // y, 9x^4-8xy^2, 3x^2(12xy^2-9x^4)-8y^4, z
-            Fq::roll(3),
-            // 9x^4-8xy^2, 3x^2(12xy^2-9x^4)-8y^4, z, y
-            hinted_script7,
-            // 9x^4-8xy^2, 3x^2(12xy^2-9x^4)-8y^4, yz
-            Fq::double(0),
-            // 9x^4-8xy^2, 3x^2(12xy^2-9x^4)-8y^4, 2yz
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-        hints.extend(hint6);
-        hints.extend(hint7);
-
-        (script, hints)
-    }
-
-    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 hinted_double(a: ark_bn254::G1Projective) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-        let (hinted_nonzero_double, hint1) = G1Projective::hinted_nonzero_double(a);
-
-        let script_lines = vec![
-            // Check if the first point is zero
-            G1Projective::is_zero_keep_element(0),
-            script! {OP_NOTIF},
-            hinted_nonzero_double,
-            script! {OP_ENDIF},
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-        if !a.into_affine().is_zero() {
-            hints.extend(hint1);
-        }
-
-        (script, hints)
-    }
-
-    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 hinted_nonzero_add(
-        a: ark_bn254::G1Projective,
-        b: ark_bn254::G1Projective,
-    ) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-        let var1 = a.z.square();
-        let var2 = b.z.square();
-        let var3 = a.x * var2;
-        let var4 = b.x * var1;
-        let var5 = a.y * var2;
-        let var6 = b.y * var1;
-        let var7 = b.z * var5;
-        let var8 = a.z * var6;
-        let var9 = var4 - var3;
-        let var10 = (var9 + var9).square();
-        let var11 = var10 * var9;
-        let var12 = var8 - var7 + var8 - var7;
-        let var13 = var10 * var3;
-        let var14 = var12.square();
-        let var15 = var13 + var13 + var13 - var14 + var11;
-        // let var16 = var15 * var12;
-        // let var17 = var7 * var11;
-
-        let (hinted_script1, hint1) = Fq::hinted_square(a.z);
-        let (hinted_script2, hint2) = Fq::hinted_square(b.z);
-        let (hinted_script3, hint3) = Fq::hinted_mul(1, a.x, 0, var2);
-        let (hinted_script4, hint4) = Fq::hinted_mul(1, b.x, 0, var1);
-        let (hinted_script5, hint5) = Fq::hinted_mul(1, var2, 0, a.y);
-        let (hinted_script6, hint6) = Fq::hinted_mul(1, var5, 0, b.z);
-        let (hinted_script7, hint7) = Fq::hinted_mul(1, var1, 0, b.y);
-        let (hinted_script8, hint8) = Fq::hinted_mul(1, var6, 0, a.z);
-        let (hinted_script9, hint9) = Fq::hinted_square(var9 + var9);
-        let (hinted_script10, hint10) = Fq::hinted_mul(1, var10, 0, var9);
-        let (hinted_script11, hint11) = Fq::hinted_mul(1, var3, 0, var10);
-        let (hinted_script12, hint12) = Fq::hinted_square(var12);
-        let (hinted_script13, hint13) = Fq::hinted_mul(1, var15, 0, var12);
-        let (hinted_script14, hint14) = Fq::hinted_mul(1, var7, 0, var11);
-        let (hinted_script15, hint15) = Fq::hinted_square(a.z + b.z);
-        let (hinted_script16, hint16) =
-            Fq::hinted_mul(1, (a.z + b.z).square() - var1 - var2, 0, var9);
-
-        let script_lines = vec![
-            // ax ay az bx by bz
-            Fq::copy(3),
-            hinted_script1,
-            // ax ay az bx by bz var1
-            Fq::copy(1),
-            hinted_script2,
-            // ax ay az bx by bz var1 var2
-            Fq::roll(7),
-            Fq::copy(1),
-            hinted_script3,
-            // ay az bx by bz var1 var2 var3
-            Fq::roll(5),
-            Fq::copy(3),
-            hinted_script4,
-            // ay az by bz var1 var2 var3 var4
-            Fq::copy(2),
-            Fq::roll(8),
-            hinted_script5,
-            // az by bz var1 var2 var3 var4 var5
-            Fq::copy(5),
-            hinted_script6,
-            // az by bz var1 var2 var3 var4 var7
-            Fq::copy(4),
-            Fq::roll(7),
-            hinted_script7,
-            // az bz var1 var2 var3 var4 var7 var6
-            Fq::copy(7),
-            hinted_script8,
-            // az bz var1 var2 var3 var4 var7 var8
-            Fq::add(7, 6),
-            // var1 var2 var3 var4 var7 var8 az+bz
-            Fq::copy(4),
-            // var1 var2 var3 var4 var7 var8 az+bz var3
-            Fq::sub(4, 0),
-            // var1 var2 var3 var7 var8 az+bz var9
-            Fq::copy(0),
-            // var1 var2 var3 var7 var8 az+bz var9 var9
-            Fq::double(0),
-            // var1 var2 var3 var7 var8 az+bz var9 2*var9
-            hinted_script9,
-            // var1 var2 var3 var7 var8 az+bz var9 var10
-            Fq::copy(1),
-            Fq::copy(1),
-            hinted_script10,
-            // var1 var2 var3 var7 var8 az+bz var9 var10 var11
-            Fq::copy(5),
-            Fq::sub(5, 0),
-            // var1 var2 var3 var7 az+bz var9 var10 var11 var8-var7
-            Fq::double(0),
-            // var1 var2 var3 var7 az+bz var9 var10 var11 var12
-            Fq::roll(6),
-            // var1 var2 var7 az+bz var9 var10 var11 var12 var3
-            Fq::roll(3),
-            // var1 var2 var7 az+bz var9 var11 var12 var3 var10
-            hinted_script11,
-            // var1 var2 var7 az+bz var9 var11 var12 var13
-            Fq::copy(1),
-            hinted_script12,
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14
-            Fq::copy(3),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14 var11
-            Fq::sub(1, 0),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14-var11
-            Fq::copy(1),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14-var11 var13
-            Fq::double(0),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14-var11 2*var13
-            Fq::sub(1, 0),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14-var11-2*var13
-            Fq::copy(0),
-            // var1 var2 var7 az+bz var9 var11 var12 var13 var14-var11-2*var13 var14-var11-2*var13
-            Fq::sub(2, 0),
-            // var1 var2 var7 az+bz var9 var11 var12 var14-var11-2*var13 var15
-            Fq::roll(2),
-            // var1 var2 var7 az+bz var9 var11 var14-var11-2*var13 var15 var12
-            hinted_script13,
-            // var1 var2 var7 az+bz var9 var11 var14-var11-2*var13 var16
-            Fq::roll(5),
-            // var1 var2 var2 z+bz var9 var11 var14-var11-2*var13 var16 var7
-            Fq::roll(3),
-            // var1 var2 az+bz var9 var14-var11-2*var13 var16 var7 var11
-            hinted_script14,
-            // var1 var2 az+bz var9 var14-var11-2*var13 var16 var17
-            Fq::double(0),
-            // var1 var2 az+bz var9 var14-var11-2*var13 var16 2*var17
-            Fq::sub(1, 0),
-            // var1 var2 az+bz var9 var14-var11-2*var13 var16-2*var17
-            Fq::roll(3),
-            // var1 var2 var9 var14-var11-2*var13 var16-2*var17 az+bz
-            hinted_script15,
-            // var1 var2 var9 var14-var11-2*var13 var16-2*var17 (az+bz)^2
-            Fq::sub(0, 5),
-            // var2 var9 var14-var11-2*var13 var16-2*var17 (az+bz)^2-var1
-            Fq::sub(0, 4),
-            // var9 var14-var11-2*var13 var16-2*var17 (az+bz)^2-var1-var2
-            Fq::roll(3),
-            // var14-var11-2*var13 var16-2*var17 (az+bz)^2-var1-var2 var9
-            hinted_script16,
-            // var14-var11-2*var13 var16-2*var17 ((az+bz)^2-var1-var2)*var9
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-        hints.extend(hint6);
-        hints.extend(hint7);
-        hints.extend(hint8);
-        hints.extend(hint9);
-        hints.extend(hint10);
-        hints.extend(hint11);
-        hints.extend(hint12);
-        hints.extend(hint13);
-        hints.extend(hint14);
-        hints.extend(hint15);
-        hints.extend(hint16);
-
-        (script, hints)
-    }
-
-    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 hinted_add(
-        a: ark_bn254::G1Projective,
-        b: ark_bn254::G1Projective,
-    ) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-        let (hinted_script1, hint1) = G1Projective::hinted_nonzero_add(a, b);
-
-        let script_lines = vec![
-            // Check if the first point is zero
-            G1Projective::is_zero_keep_element(0),
-            script! {OP_IF},
-            // First point is zero
-            G1Projective::drop(),
-            script! {OP_ELSE},
-            // Check if the second point is zero
-            G1Projective::is_zero_keep_element(1),
-            script! {OP_IF},
-            // Second point is zero
-            G1Projective::roll(1),
-            G1Projective::drop(),
-            script! {OP_ELSE},
-            hinted_script1,
-            script! {OP_ENDIF},
-            script! {OP_ENDIF},
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-        if !a.into_affine().is_zero() && !b.into_affine().is_zero() {
-            hints.extend(hint1);
-        }
-
-        (script, hints)
-    }
-
-    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 hinted_equalverify(
-        a: ark_bn254::G1Projective,
-        b: ark_bn254::G1Projective,
-    ) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        let (hinted_script1, hint1) = Fq::hinted_square(a.z);
-        let (hinted_script2, hint2) = Fq::hinted_mul(1, a.z, 0, a.z.square());
-        let (hinted_script3, hint3) = Fq::hinted_square(b.z);
-        let (hinted_script4, hint4) = Fq::hinted_mul(1, b.z, 0, b.z.square());
-        let (hinted_script5, hint5) = Fq::hinted_mul(1, a.x, 0, b.z.square());
-        let (hinted_script6, hint6) = Fq::hinted_mul(1, b.x, 0, a.z.square());
-        let (hinted_script7, hint7) = Fq::hinted_mul(1, a.y, 0, b.z.square() * b.z);
-        let (hinted_script8, hint8) = Fq::hinted_mul(1, b.y, 0, a.z.square() * a.z);
-
-        let script_lines = vec![
-            Fq::copy(3),
-            hinted_script1,
-            Fq::roll(4),
-            Fq::copy(1),
-            hinted_script2,
-            Fq::copy(2),
-            hinted_script3,
-            Fq::roll(3),
-            Fq::copy(1),
-            hinted_script4,
-            Fq::roll(7),
-            Fq::roll(2),
-            hinted_script5,
-            Fq::roll(5),
-            Fq::roll(4),
-            hinted_script6,
-            Fq::equalverify(1, 0),
-            Fq::roll(3),
-            Fq::roll(1),
-            hinted_script7,
-            Fq::roll(2),
-            Fq::roll(2),
-            hinted_script8,
-            Fq::equalverify(1, 0),
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-        hints.extend(hint6);
-        hints.extend(hint7);
-        hints.extend(hint8);
-
-        (script, hints)
-    }
-
-    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
-        )
-    }
-
-    // Input Stack: [x, y, z]
-    // Output Stack: [x/z^2, y/z^3]
-    pub fn hinted_into_affine(a: ark_bn254::G1Projective) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        let (
-            (hinted_script1, hint1),
-            (hinted_script2, hint2),
-            (hinted_script3, hint3),
-            (hinted_script4, hint4),
-            (hinted_script5, hint5),
-        ) = if a.z != ark_bn254::Fq::ONE && a.z != ark_bn254::Fq::ZERO {
-            let (hinted_script1, hint1) = Fq::hinted_inv(a.z);
-            let z_inv = a.z.inverse().unwrap();
-            let (hinted_script2, hint2) = Fq::hinted_square(z_inv);
-            let (hinted_script3, hint3) = Fq::hinted_mul(1, z_inv.square(), 0, z_inv);
-            let (hinted_script4, hint4) = Fq::hinted_mul(1, a.y, 0, z_inv.square() * z_inv);
-            let (hinted_script5, hint5) = Fq::hinted_mul(1, a.x, 0, z_inv.square());
-            (
-                (hinted_script1, hint1),
-                (hinted_script2, hint2),
-                (hinted_script3, hint3),
-                (hinted_script4, hint4),
-                (hinted_script5, hint5),
-            )
-        } else {
-            let (hinted_script1, hint1) = (script! {}, vec![]);
-            let (hinted_script2, hint2) = (script! {}, vec![]);
-            let (hinted_script3, hint3) = (script! {}, vec![]);
-            let (hinted_script4, hint4) = (script! {}, vec![]);
-            let (hinted_script5, hint5) = (script! {}, vec![]);
-            (
-                (hinted_script1, hint1),
-                (hinted_script2, hint2),
-                (hinted_script3, hint3),
-                (hinted_script4, hint4),
-                (hinted_script5, hint5),
-            )
-        };
-
-        let mut script = script! {};
-        let script_lines = [
-            // // 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),
-            script! {OP_IF},
-            // Z is zero so drop the point and return the affine::identity
-            Fq::drop(),
-            Fq::drop(),
-            Fq::drop(),
-            G1Affine::identity(),
-            script! {OP_ELSE},
-            Fq::is_one_keep_element_not_montgomery(0),
-            script! {OP_IF},
-            Fq::drop(),
-            script! {OP_ELSE},
-            // 2.2 Otherwise, Z is non-one, so it must have an inverse in a field.
-            // conpute Z^-1
-            hinted_script1,
-            // compute Z^-2
-            Fq::copy(0),
-            hinted_script2,
-            // compute Z^-3 = Z^-2 * z^-1
-            Fq::copy(0),
-            Fq::roll(2),
-            hinted_script3,
-            // For now, stack: [x, y, z^-2, z^-3]
-
-            // compute Y/Z^3 = Y * Z^-3
-            Fq::roll(2),
-            hinted_script4,
-            // compute X/Z^2 = X * Z^-2
-            Fq::roll(1),
-            Fq::roll(2),
-            hinted_script5,
-            // Return (x,y)
-            Fq::roll(1),
-            script! {OP_ENDIF},
-            script! {OP_ENDIF},
-        ];
-
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        if a.z != ark_bn254::Fq::ONE && a.z != ark_bn254::Fq::ZERO {
-            hints.extend(hint1);
-            hints.extend(hint2);
-            hints.extend(hint3);
-            hints.extend(hint4);
-            hints.extend(hint5);
-        }
-
-        (script, hints)
-    }
-
-    /// 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 script = 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 }
-                { script!{ OP_PICK }.add_stack_hint(-(((27 * 2) ^ (TERMS + 26)) as i32), 0) }
-                for _ in 0..26 {
-                    OP_FROMALTSTACK
-                    { script!{ OP_PICK }.add_stack_hint(-(((27 * 2) ^ (TERMS + 26)) as i32), 0)}
-                }
-
-                { 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() }
-        };
-        script
-    }
-
-    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 {
-                        { G1Projective::push_zero() }
-                    } 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! {
-                { G1Projective::dfs(0, depth - 1, 0, 1<<i_step) }
-                { G1Projective::add() }
-            };
-            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)) as usize]) }
-                OP_ELSE
-                    if mask == 0 {
-                        { G1Projective::push_zero() }
-                    } else {
-                        { G1Projective::push(p_mul[mask 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
-        }
-    }
-
-    fn dfs_with_constant_mul_not_montgomery(
-        index: u32,
-        depth: u32,
-        mask: u32,
-        p_mul: &Vec<ark_bn254::G1Projective>,
-    ) -> Script {
-        if depth == 0 {
-            return script! {
-                OP_IF
-                    { G1Projective::push_not_montgomery(p_mul[(mask + (1<<index)) as usize]) }
-                OP_ELSE
-                    if mask == 0 {
-                        { G1Projective::push_zero() }
-                    } else {
-                        { G1Projective::push_not_montgomery(p_mul[mask as usize]) }
-                    }
-                OP_ENDIF
-            };
-        }
-
-        script! {
-            OP_IF
-                { G1Projective::dfs_with_constant_mul_not_montgomery(index+1, depth-1, mask + (1<<index), p_mul) }
-            OP_ELSE
-                { G1Projective::dfs_with_constant_mul_not_montgomery(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(ark_bn254::G1Projective::ZERO);
-        // p_mul.push(p);
-        for _ in 1..(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! {
-                { G1Projective::dfs_with_constant_mul(0, depth - 1, 0, &p_mul) }
-
-                { G1Projective::add() }
-            };
-            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 }
-            }
-        }
-    }
-
-    // [g1projective]
-    pub fn hinted_scalar_mul_by_constant_g1(
-        scalar: ark_bn254::Fr,
-        p: &mut ark_bn254::G1Projective,
-    ) -> (Script, Vec<Hint>) {
-        let (mut loop_scripts, mut hints) = (Vec::new(), 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(ark_bn254::G1Projective::ZERO);
-        for _ in 0..(1 << i_step) {
-            p_mul.push(p_mul.last().unwrap() + *p);
-        }
-
-        let mut c: ark_bn254::G1Projective = ark_bn254::G1Projective::ZERO;
-        let scalar_bigint = scalar.into_bigint();
-        while i < Fr::N_BITS {
-            let depth = min(Fr::N_BITS - i, i_step);
-
-            if i > 0 {
-                for _ in 0..depth {
-                    let (double_script, double_hints) = G1Projective::hinted_double(c);
-                    loop_scripts.push(double_script);
-                    hints.extend(double_hints);
-                    c = c.double();
-                }
-            }
-
-            loop_scripts.push(script! {
-                for _ in 0..depth {
-                    OP_FROMALTSTACK
-                }
-            });
-
-            let mut mask = 0;
-
-            for j in 0..depth {
-                mask *= 2;
-                mask += scalar_bigint.get_bit((Fr::N_BITS - i - j - 1) as usize) as u32;
-            }
-            let (add_script, add_hints) = G1Projective::hinted_add(c, p_mul[mask as usize]);
-            let add_loop = script! {
-                { G1Projective::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul) }
-                { add_script }
-            };
-            loop_scripts.push(add_loop.clone());
-            if mask != 0 {
-                hints.extend(add_hints);
-                c += p_mul[mask as usize];
-            }
-            i += i_step;
-        }
-        *p = c;
-        let mut script = script! {
-            { Fr::convert_to_le_bits_toaltstack() }
-
-            { G1Projective::push_zero() }
-        };
-
-        for script_line in loop_scripts {
-            script = script.push_script(script_line.compile());
-        }
-
-        (script, hints)
-    }
-}
-
-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 check_line_through_point(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            // [x, y]
-            { Fq::roll(1) }
-            // [y, x]
-            { Fq::mul_by_constant(&c3) }
-            // [y, alpha * x]
-            { Fq::neg(0) }
-            // [y, -alpha * x]
-            { Fq::add(1, 0) }
-            // [y - alpha * x]
-
-            { fq_push(c4) }
-            // [y - alpha * x, -bias]
-            { Fq::add(1, 0) }
-            // [y - alpha * x - bias]
-
-            { Fq::push_zero() }
-            // [y - alpha * x - bias, 0]
-            { Fq::equalverify(1, 0) }
-        }
-    }
-
-    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 check_chord_line(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            // check: Q.y - alpha * Q.x - bias = 0
-            { G1Affine::check_line_through_point(c3, c4) }
-            // [T.x, T.y]
-            // check: T.y - alpha * T.x - bias = 0
-            { G1Affine::check_line_through_point(c3, c4) }
-            // []
-        }
-    }
-
-    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 check_tangent_line(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {                             // x, y
-            { Fq::copy(0) }                   // x, y, y
-            { Fq::double(0) }                 // x, y, 2y
-            { Fq::mul_by_constant(&c3) }      // x, y, alpha * (2 * y)
-            { Fq::copy(2) }                   // x, y, alpha * (2 * y), x
-            { Fq::square() }                  // x, y, alpha * (2 * y), x^2
-            { Fq::copy(0) }                   // x, y, alpha * (2 * y), x^2, x^2
-            { Fq::double(0) }                 // x, y, alpha * (2 * y), x^2, 2x^2
-            { Fq::add(1, 0) }                 // x, y, alpha * (2 * y), 3 * x^2
-            { Fq::neg(0) }                    // x, y, alpha * (2 * y), -3 * x^2
-            { Fq::add(1, 0) }                 // x, y, alpha * (2 * y) - 3 * x^2
-            { Fq::is_zero(0) } OP_VERIFY      // x, y
-            { G1Affine::check_line_through_point(c3, c4) }
-        }
-    }
-
-    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 push_not_montgomery(element: ark_bn254::G1Affine) -> Script {
-        script! {
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(element.x).to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(element.y).to_u32_digits()) }
-        }
-    }
-
-    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
-                { G1Affine::dfs_with_constant_mul(index + 1, depth - 1, mask + (1 << index), p_mul) }
-            OP_ELSE
-                { G1Affine::dfs_with_constant_mul(index + 1, depth - 1, mask, p_mul) }
-            OP_ENDIF
-        }
-    }
-    pub fn dfs_with_constant_mul_not_montgomery(
-        index: u32,
-        depth: u32,
-        mask: u32,
-        p_mul: &Vec<ark_bn254::G1Affine>,
-    ) -> Script {
-        if depth == 0 {
-            return script! {
-                OP_IF
-                    { G1Affine::push_not_montgomery(p_mul[(mask + (1 << index)) as usize]) }
-                OP_ELSE
-                    if mask == 0 {
-                        { G1Affine::push_zero() }
-                    } else {
-                        { G1Affine::push_not_montgomery(p_mul[mask as usize]) }
-                    }
-                OP_ENDIF
-            };
-        }
-
-        script! {
-            OP_IF
-                { G1Affine::dfs_with_constant_mul_not_montgomery(index + 1, depth - 1, mask + (1 << index), p_mul) }
-            OP_ELSE
-                { G1Affine::dfs_with_constant_mul_not_montgomery(index + 1, depth - 1, mask, p_mul) }
-            OP_ENDIF
-        }
-    }
-
-    // scalar already in stack, base point as input parameter
-    pub fn scalar_mul_by_constant_g1(
-        p: ark_bn254::G1Affine,
-        coeff: Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-        step_p: Vec<ark_bn254::G1Affine>,
-        trace: Vec<ark_bn254::G1Affine>,
-    ) -> Script {
-        let mut coeff_iter = coeff.iter();
-        let mut step_p_iter = step_p.iter();
-        let mut trace_iter = trace.iter();
-        let mut loop_scripts = Vec::new();
-        let mut i = 0;
-        // options: i_step = 2-15
-        let i_step = 12;
-
-        // precomputed lookup table (affine)
-        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
-        p_mul.push(ark_bn254::G1Affine::zero());
-        for _ in 1..(1 << i_step) {
-            p_mul.push((*p_mul.last().unwrap() + p).into_affine());
-        }
-
-        while i < Fr::N_BITS {
-            let depth = min(Fr::N_BITS - i, i_step);
-
-            // double(step-size) point
-            if i > 0 {
-                for _ in 0..depth {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-                    let double_loop = G1Affine::check_double(double_coeff.0, double_coeff.1);
-                    loop_scripts.push(double_loop.clone());
-                }
-            }
-            // if i == i_step * 2 {
-            //     break;
-            // }
-
-            // squeeze a bucket scalar
-            loop_scripts.push(script! {
-                for _ in 0..depth {
-                    OP_FROMALTSTACK
-                }
-            });
-
-            // add point
-            let add_coeff = if i > 0 {
-                *coeff_iter.next().unwrap()
-            } else {
-                (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
-            };
-            let point_after_add = trace_iter.next().unwrap();
-            let add_loop = script! {
-                // query bucket point through lookup table
-                { G1Affine::dfs_with_constant_mul(0, depth - 1, 0, &p_mul) }
-                // check before usage
-                if i > 0 {
-                    { G1Affine::check_add(add_coeff.0, add_coeff.1) }
-                }
-                // FOR DEBUG
-                // { G1Affine::push(point_after_add.clone()) }
-                // { G1Affine::equalverify() }
-                // { G1Affine::push(point_after_add.clone()) }
-            };
-            loop_scripts.push(add_loop.clone());
-            // if i == i_step * 21 {
-            //     break;
-            // }
-            i += i_step;
-        }
-        assert!(coeff_iter.next().is_none());
-        assert!(step_p_iter.next().is_none());
-        assert!(trace_iter.next().is_none());
-
-        script! {
-            { Fr::decode_montgomery() }
-            { Fr::convert_to_le_bits_toaltstack() }
-
-            for script in loop_scripts {
-                { script }
-            }
-        }
-    }
-
-    pub fn hinted_scalar_mul_by_constant_g1(
-        scalar: ark_bn254::Fr,
-        p: &mut ark_bn254::G1Affine,
-        coeff: Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-        step_p: Vec<ark_bn254::G1Affine>,
-        trace: Vec<ark_bn254::G1Affine>,
-    ) -> (Script, Vec<Hint>) {
-        let mut hints = vec![];
-        let mut coeff_iter = coeff.iter();
-        let mut step_p_iter = step_p.iter();
-        let mut trace_iter = trace.iter();
-        let mut loop_scripts = Vec::new();
-        let mut i = 0;
-        // options: i_step = 2-15
-        let i_step = 12;
-
-        // precomputed lookup table (affine)
-        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
-        p_mul.push(ark_bn254::G1Affine::zero());
-        for _ in 1..(1 << i_step) {
-            p_mul.push((*p_mul.last().unwrap() + *p).into_affine());
-        }
-
-        let mut c: ark_bn254::G1Affine = ark_bn254::G1Affine::zero();
-
-        let scalar_bigint = scalar.into_bigint();
-
-        while i < Fr::N_BITS {
-            let depth = min(Fr::N_BITS - i, i_step);
-            // double(step-size) point
-            if i > 0 {
-                for _ in 0..depth {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-                    c = (c + c).into_affine();
-                }
-            }
-
-            // squeeze a bucket scalar
-            loop_scripts.push(script! {
-                for _ in 0..depth {
-                    OP_FROMALTSTACK
-                }
-            });
-
-            let mut mask = 0;
-
-            for j in 0..depth {
-                mask *= 2;
-                mask += scalar_bigint.get_bit((Fr::N_BITS - i - j - 1) as usize) as u32;
-            }
-
-            // add point
-            if i == 0 {
-                loop_scripts.push(G1Affine::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul));
-                let point_after_add = trace_iter.next().unwrap();
-            }
-            else {
-                let add_coeff = *coeff_iter.next().unwrap();
-                let point_after_add = trace_iter.next().unwrap();
-                let (add_script, add_hints) =
-                G1Affine::hinted_check_add(c, p_mul[mask as usize], add_coeff.0);
-                let add_loop = script! {
-                    // query bucket point through lookup table
-                    { G1Affine::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul) }
-                    // check before usage
-                    { add_script }
-                };
-                loop_scripts.push(add_loop.clone());
-                hints.extend(add_hints);
-            }
-            c = (c + p_mul[mask as usize]).into_affine();
-
-            i += i_step;
-        }
-        assert!(coeff_iter.next().is_none());
-        assert!(step_p_iter.next().is_none());
-        assert!(trace_iter.next().is_none());
-
-        println!("debug: c:{:?}", c);
-        *p = c;
-
-        let mut script = script! {
-            { Fr::convert_to_le_bits_toaltstack() }
-
-        };
-
-        for script_line in loop_scripts {
-            script = script.push_script(script_line.compile());
-        }
-
-        (script, hints)
-    }
-
-    pub fn check_add(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            { Self::is_zero_keep_element() }
-            OP_IF
-                { Self::drop() }
-            OP_ELSE
-                { Self::roll(1) }
-                { Self::is_zero_keep_element() }
-                OP_IF
-                    { Self::drop() }
-                OP_ELSE
-                    { Fq::copy(3) }
-                    { Fq::roll(3) }
-                    { Fq::copy(3) }
-                    { Fq::roll(3) }
-                    { G1Affine::check_chord_line(c3, c4) }
-                    { G1Affine::add(c3, c4) }
-                OP_ENDIF
-            OP_ENDIF
-        }
-    }
-
-    pub fn hinted_check_add(
-        t: ark_bn254::G1Affine,
-        q: ark_bn254::G1Affine,
-        c3: ark_bn254::Fq,
-    ) -> (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, c3);
-        let (hinted_script2, hint2) = Self::hinted_add(t.x, q.x, c3);
-
-        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 add(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            // [T.x, Q.x]
-            { Fq::neg(0) }
-            // [T.x, -Q.x]
-            { Fq::roll(1) }
-            // [-Q.x, T.x]
-            { Fq::neg(0) }
-            // [-T.x - Q.x]
-            { Fq::add(1, 0) }
-            // [-T.x - Q.x]
-            { fq_push(c3) }
-            // [-T.x - Q.x, alpha]
-            { Fq::copy(0) }
-            // [-T.x - Q.x, alpha, alpha]
-            { Fq::square() }
-            // [-T.x - Q.x, alpha, alpha^2]
-            // calculate x' = alpha^2 - T.x - Q.x
-            { Fq::add(2, 0) }
-            // [alpha, x']
-            { Fq::copy(0) }
-            // [alpha, x', x']
-            { Fq::roll(2) }
-            { Fq::mul() }
-            // [x', alpha * x']
-            { Fq::neg(0) }
-            // [x', -alpha * x']
-            { fq_push(c4) }
-            // [x', -alpha * x', -bias]
-            // compute y' = -bias - alpha * x'
-            { Fq::add(1, 0) }
-            // [x', y']
-        }
-    }
-
-    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 double(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            { Fq::double(0) }
-            { Fq::neg(0) }
-            // [- 2 * T.x]
-            { fq_push(c3) }
-            { Fq::copy(0) }
-            { Fq::square() }
-            // [- 2 * T.x, alpha, alpha^2]
-            { Fq::add(2, 0) }
-            { Fq::copy(0) }
-            // [alpha, x', x']
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::neg(0) }
-            // [x', -alpha * x']
-
-            { fq_push(c4) }
-            { Fq::add(1, 0) }
-            // [x', y']
-        }
-    }
-
-    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 check_double(c3: ark_bn254::Fq, c4: ark_bn254::Fq) -> Script {
-        script! {
-            { Self::is_zero_keep_element() }
-            OP_NOTIF
-                { Fq::copy(1) }
-                { Fq::roll(1) }
-                { G1Affine::check_tangent_line(c3, c4) }
-                { G1Affine::double(c3, c4) }
-            OP_ENDIF
-        }
-    }
-
-    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 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() }) }
-    pub fn into_projective() -> Script {
-        script! {
-            { Fq::is_zero_keep_element(0) }
-            OP_TOALTSTACK
-            { Fq::is_zero_keep_element(1) }
-            OP_FROMALTSTACK OP_BOOLAND
-            OP_IF // if x == 0 and y == 0, then z = 0
-                { Fq::push_zero() }
-            OP_ELSE // else z = 1
-                { Fq::push_one() }
-            OP_ENDIF
-        }
-    }
-
-    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) }
-        }
-    }
-}
-
-pub struct G2Affine;
-
-//B = Fq2(19485874751759354771024239261021720505790618469301721065564631296452457478373,
-//266929791119991161246907387137283842545076965332900288569378510910307636690)
-impl G2Affine {
-    pub fn is_on_curve() -> Script {
-        script! {
-            { Fq2::copy(2) }
-            { Fq2::square() }
-            { Fq2::roll(4) }
-            { Fq2::mul(2,0) }
-            { Fq::push_dec("19485874751759354771024239261021720505790618469301721065564631296452457478373") }
-            { Fq::push_dec("266929791119991161246907387137283842545076965332900288569378510910307636690") }
-            { Fq2::add(2, 0) }
-            { Fq2::roll(2) }
-            { Fq2::square() }
-            { Fq2::equal() }
-        }
-    }
-
-    pub fn push_not_montgomery(element: ark_bn254::G2Affine) -> Script {
-        script! {
-            { fq2_push_not_montgomery(element.x) }
-            { fq2_push_not_montgomery(element.y) }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::bn254::curves::{G1Affine, G1Projective, G2Affine};
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq2::Fq2;
-    use crate::bn254::msm::prepare_msm_input;
-    use crate::bn254::utils::{
-        fq2_push, fq_push_not_montgomery, fr_push, fr_push_not_montgomery, g1_affine_push,
-        g1_affine_push_not_montgomery,
-    };
-    use crate::{
-        execute_script, execute_script_without_stack_limit, run, treepp::*
-    };
-
-    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, test_rng, UniformRand};
-    use core::ops::{Add, Mul};
-    use num_bigint::BigUint;
-    use num_traits::{One, Zero};
-
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::ops::Neg;
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_hinted_double_projective() {
-        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 (hinted_double, mut hints) = G1Projective::hinted_double(a);
-            let (hinted_equal_verify1, hints1) = G1Projective::hinted_equalverify(a + a, c);
-            hints.extend(hints1);
-            println!("G1.hinted_double: {} bytes", hinted_double.len());
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { G1Projective::push_not_montgomery(a) }
-                { hinted_double }
-                { G1Projective::push_not_montgomery(c) }
-                { hinted_equal_verify1 }
-                OP_TRUE
-            };
-            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()
-            );
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_hinted_nonzero_add_projective() {
-        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 (hinted_nonzero_add, mut hints) = G1Projective::hinted_nonzero_add(a, b);
-            let (hinted_equal_verify1, hints1) = G1Projective::hinted_equalverify(a + b, c);
-            println!("G1.hinted_nonzero_add: {} bytes", hinted_nonzero_add.len());
-            hints.extend(hints1);
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { G1Projective::push_not_montgomery(a) }
-                { G1Projective::push_not_montgomery(b) }
-                { hinted_nonzero_add }
-                { G1Projective::push_not_montgomery(c) }
-                { hinted_equal_verify1 }
-                OP_TRUE
-            };
-            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_hinted_add_curves() {
-        println!("G1.hinted_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 mut hints = Vec::new();
-            let (hinted_add1, hints1) = G1Projective::hinted_add(a, b);
-            let (hinted_equal_verify1, hints2) = G1Projective::hinted_equalverify(a + b, c);
-            let (hinted_add2, hints3) =
-                G1Projective::hinted_add(a, ark_bn254::G1Projective::zero());
-            let (hinted_equal_verify2, hints4) =
-                G1Projective::hinted_equalverify(a + ark_bn254::G1Projective::zero(), a);
-            let (hinted_add3, hints5) =
-                G1Projective::hinted_add(ark_bn254::G1Projective::zero(), a);
-            let (hinted_equal_verify3, hints6) =
-                G1Projective::hinted_equalverify(ark_bn254::G1Projective::zero() + a, a);
-            hints.extend(hints1);
-            hints.extend(hints2);
-            hints.extend(hints3);
-            hints.extend(hints4);
-            hints.extend(hints5);
-            hints.extend(hints6);
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                // Test random a + b = c
-                { G1Projective::push_not_montgomery(a) }
-                { G1Projective::push_not_montgomery(b) }
-                { hinted_add1 }
-                { G1Projective::push_not_montgomery(c) }
-                { hinted_equal_verify1 }
-
-                // Test random a + 0 = a
-                { G1Projective::push_not_montgomery(a) }
-                { G1Projective::push_zero() }
-                { hinted_add2 }
-                { G1Projective::push_not_montgomery(a) }
-                { hinted_equal_verify2 }
-
-                // Test random 0 + a = a
-                { G1Projective::push_zero() }
-                { G1Projective::push_not_montgomery(a) }
-                { hinted_add3 }
-                { G1Projective::push_not_montgomery(a) }
-                { hinted_equal_verify3 }
-
-                OP_TRUE
-            };
-            println!("curves::test_hinted_add = {} bytes", script.len());
-            assert!(execute_script(script).success);
-        }
-    }
-
-    #[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_not_montgomery(alpha) }
-            { fq_push_not_montgomery(bias_minus) }
-            { fq_push_not_montgomery(t.x) }
-            { fq_push_not_montgomery(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_not_montgomery(alpha) }
-            { fq_push_not_montgomery(bias_minus) }
-            { fq_push_not_montgomery(t.x) }
-            { fq_push_not_montgomery(t.y) }
-            { fq_push_not_montgomery(q.x) }
-            { fq_push_not_montgomery(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_not_montgomery(alpha) }
-            { fq_push_not_montgomery(bias_minus) }
-            { fq_push_not_montgomery(t.x) }
-            { fq_push_not_montgomery(q.x) }
-            { hinted_add.clone() }
-            // [x']
-            { fq_push_not_montgomery(y) }
-            // [x', y', y]
-            { Fq::equalverify(1,0) }
-            // [x']
-            { fq_push_not_montgomery(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, alpha);
-
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-            { fq_push_not_montgomery(t.x) }
-            { fq_push_not_montgomery(t.y) }
-            { fq_push_not_montgomery(q.x) }
-            { fq_push_not_montgomery(q.y) }
-            { hinted_check_add.clone() }
-            // [x']
-            { fq_push_not_montgomery(y) }
-            // [x', y', y]
-            { Fq::equalverify(1,0) }
-            // [x']
-            { fq_push_not_montgomery(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_not_montgomery(t.x) }
-            { fq_push_not_montgomery(t.y) }
-            { hinted_check_double.clone() }
-            { fq_push_not_montgomery(y) }
-            { Fq::equalverify(1,0) }
-            { fq_push_not_montgomery(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_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());
-            run(script);
-        }
-    }
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_hinted_scalar_mul_by_constant_g1() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let mut p = ark_bn254::G1Projective::rand(&mut prng);
-            let q = p.mul(scalar);
-
-            let (hinted_scalar_mul, mut hints) =
-                G1Projective::hinted_scalar_mul_by_constant_g1(scalar, &mut p);
-            assert_eq!(p, q);
-            println!(
-                "G1.scalar_mul_by_constant_g1: {} bytes",
-                hinted_scalar_mul.len()
-            );
-            let (hinted_equal_verify, hint1) = G1Projective::hinted_equalverify(p, q);
-            hints.extend(hint1);
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { fr_push_not_montgomery(scalar) }
-                { hinted_scalar_mul.clone() }
-                { G1Projective::push_not_montgomery(q) }
-                { hinted_equal_verify }
-                OP_TRUE
-            };
-            println!("curves::test_scalar_mul = {} bytes", script.len());
-            let exec_result = execute_script_without_stack_limit(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_scalar_mul_affine() {
-        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 (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-        let scalar_mul_affine_script = crate::bn254::curves::G1Affine::scalar_mul_by_constant_g1(
-            bases[0],
-            inner_coeffs[0].0.clone(),
-            inner_coeffs[0].1.clone(),
-            inner_coeffs[0].2.clone(),
-        );
-
-        let script = script! {
-            { fr_push(scalars[0]) }
-            { scalar_mul_affine_script.clone() }
-            { crate::bn254::curves::G1Affine::push((bases[0] * scalars[0]).into_affine()) }
-            { crate::bn254::curves::G1Affine::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-
-        println!(
-            "script size of scalar_mul_affine: {}",
-            scalar_mul_affine_script.len()
-        );
-    }
-    #[test]
-    fn test_hinted_scalar_mul_by_constant_g1_affine() {
-        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 mut bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        let q = bases[0].mul(scalars[0]).into_affine();
-        println!("debug: expected res:{:?}", q);
-        let (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-
-        let (scalar_mul_affine_script, hints) =
-            crate::bn254::curves::G1Affine::hinted_scalar_mul_by_constant_g1(
-                scalars[0],
-                &mut bases[0],
-                inner_coeffs[0].0.clone(),
-                inner_coeffs[0].1.clone(),
-                inner_coeffs[0].2.clone(),
-            );
-        assert_eq!(bases[0], q);
-        println!("assert success");
-
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-            { fr_push_not_montgomery(scalars[0]) }
-            { scalar_mul_affine_script.clone() }
-            // { fq_push_not_montgomery(q.y) }
-            // { Fq::equalverify(1, 0) }
-            // { fq_push_not_montgomery(q.x) }
-            // { Fq::equalverify(1, 0) }
-            { G1Affine::push_not_montgomery(q) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-
-        println!(
-            "script size of scalar_mul_affine: {}",
-            scalar_mul_affine_script.len()
-        );
-    }
-
-    #[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");
-            run(script);
-            end_timer!(start);
-        }
-    }
-
-    #[test]
-    // #[ignore]
-    fn test_hinted_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 (hinted_into_affine_zero, hints_zero) = G1Projective::hinted_into_affine(p_zero);
-            let (hinted_into_affine_z_one, hints_z_one) = G1Projective::hinted_into_affine(p_z_one);
-            let (hinted_into_affine, hints) = G1Projective::hinted_into_affine(p);
-
-            let start = start_timer!(|| "collect_script");
-
-            let script = script! {
-                for hint in hints_zero {
-                    { hint.push() }
-                }
-                // When point is zero.
-                { G1Projective::push_not_montgomery(p_zero) }
-                { hinted_into_affine_zero }
-                { g1_affine_push_not_montgomery(q_zero) }
-                { G1Affine::equalverify() }
-
-                for hint in hints_z_one {
-                    { hint.push() }
-                }
-                // when  p.z = one
-                { G1Projective::push_not_montgomery(p_z_one) }
-                { hinted_into_affine_z_one }
-                { g1_affine_push_not_montgomery(q_z_one) }
-                { G1Affine::equalverify() }
-
-                for hint in hints {
-                    { hint.push() }
-                }
-                // Otherwise, (X,Y,Z)->(X/z^2, Y/z^3)
-                { G1Projective::push_not_montgomery(p) }
-                { hinted_into_affine }
-                { g1_affine_push_not_montgomery(q) }
-                { G1Affine::equalverify() }
-
-                OP_TRUE
-            };
-            end_timer!(start);
-
-            let start = start_timer!(|| "execute_script");
-            let exec_result = execute_script(script);
-            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)
-            );
-            run(script);
-        }
-    }
-
-    #[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");
-            run(script);
-            end_timer!(start);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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());
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_hinted_projective_equalverify() {
-        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 (equalverify, hints) = G1Projective::hinted_equalverify(p, q.into_group());
-            println!("G1.equalverify: {} bytes", equalverify.len());
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { G1Projective::push_not_montgomery(p) }
-                { Fq::push_u32_le_not_montgomery(&BigUint::from(q.x).to_u32_digits()) }
-                { Fq::push_u32_le_not_montgomery(&BigUint::from(q.y).to_u32_digits()) }
-                { Fq::push_one_not_montgomery() }
-                { 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());
-            run(script);
-        }
-    }
-
-    #[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() }
-            };
-            run(script);
-
-            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());
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_g2_affine_is_on_curve() {
-        let affine_is_on_curve = G2Affine::is_on_curve();
-
-        println!("G2.affine_is_on_curve: {} bytes", affine_is_on_curve.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..3 {
-            let point = ark_bn254::G2Affine::rand(&mut prng);
-
-            let script = script! {
-                { fq2_push(point.x) }
-                { fq2_push(point.y) }
-                { affine_is_on_curve.clone()}
-            };
-            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
-            run(script);
-
-            let script = script! {
-                { fq2_push(point.x) }
-                { fq2_push(point.y) }
-                { Fq2::double(0) }
-                { affine_is_on_curve.clone()}
-                OP_NOT
-            };
-            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-
-        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
-            };
-            run(script);
-        }
-
-        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
-            };
-            run(script);
-        }
-    }
-}
diff --git a/src/bn254/ell_coeffs.rs b/src/bn254/ell_coeffs.rs
deleted file mode 100644
index b138f9089..000000000
--- a/src/bn254/ell_coeffs.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Rephrased from https://github.com/arkworks-rs/algebra/blob/master/ec/src/models/bn/g2.rs#L185
-// Cannot directly obtain G2 because of visibility
-
-use ark_ec::bn::g2::G2Prepared as ark_G2Prepared;
-use ark_ec::bn::{BnConfig, TwistType};
-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 num_traits::One;
-
-pub type G2Affine<P> = Affine<<P as BnConfig>::G2Config>;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct G2Prepared {
-    /// Stores the coefficients of the line evaluations as calculated in
-    /// <https://eprint.iacr.org/2013/722.pdf>
-    pub ell_coeffs: Vec<EllCoeff>,
-    pub infinity: bool,
-}
-
-// aka. line in miller loop.
-pub type EllCoeff = (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2);
-
-#[derive(Clone, Copy, Debug)]
-struct G2HomProjective {
-    x: ark_bn254::Fq2,
-    y: ark_bn254::Fq2,
-    z: ark_bn254::Fq2,
-}
-
-impl G2HomProjective {
-    fn double_in_place(&mut self, two_inv: &ark_bn254::Fq) -> EllCoeff {
-        // Formula for line function when working with
-        // homogeneous projective coordinates.
-
-        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;
-        g.mul_assign_by_fp(two_inv);
-        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;
-        match ark_bn254::Config::TWIST_TYPE {
-            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 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);
-
-        match ark_bn254::Config::TWIST_TYPE {
-            TwistType::M => (j, -theta, lambda),
-            TwistType::D => (lambda, -theta, j),
-        }
-    }
-}
-
-impl Default for G2Prepared {
-    fn default() -> Self {
-        Self::from(ark_bn254::G2Affine::generator())
-    }
-}
-
-impl G2Prepared {
-    fn affine_double_in_place(
-        t: &mut ark_bn254::G2Affine,
-        three_div_two: &ark_bn254::Fq,
-    ) -> EllCoeff {
-        //  for affine coordinates
-        //  slope: alpha = 3 * x^2 / 2 * y
-        // intercept: bias = y - alpha * x
-        let mut alpha = t.x.square();
-        alpha /= t.y;
-        alpha.mul_assign_by_fp(three_div_two);
-        let bias = t.y - alpha * t.x;
-
-        // update T
-        // T.x = alpha^2 - 2 * t.x
-        // T.y = -bias - alpha * T.x
-        let tx = alpha.square() - t.x.double();
-        t.y = -bias - alpha * tx;
-        t.x = tx;
-
-        (ark_bn254::Fq2::ONE, alpha, -bias)
-    }
-
-    fn affine_add_in_place(t: &mut ark_bn254::G2Affine, q: &ark_bn254::G2Affine) -> EllCoeff {
-        // alpha = (t.y - q.y) / (t.x - q.x)
-        // bias = t.y - alpha * t.x
-        let alpha = (t.y - q.y) / (t.x - q.x);
-        let bias = t.y - alpha * t.x;
-
-        // update T
-        // T.x = alpha^2 - t.x - q.x
-        // T.y = -bias - alpha * T.x
-        let tx = alpha.square() - t.x - q.x;
-        t.y = -bias - alpha * tx;
-        t.x = tx;
-
-        (ark_bn254::Fq2::ONE, alpha, -bias)
-    }
-
-    pub fn from_affine(q: ark_bn254::G2Affine) -> Self {
-        if q.infinity {
-            G2Prepared {
-                ell_coeffs: vec![],
-                infinity: true,
-            }
-        } else {
-            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 ell_coeffs = vec![];
-            let mut r = q;
-
-            let neg_q = -q;
-
-            for bit in ark_bn254::Config::ATE_LOOP_COUNT.iter().rev().skip(1) {
-                ell_coeffs.push(Self::affine_double_in_place(&mut r, &three_div_two));
-
-                match bit {
-                    1 => ell_coeffs.push(Self::affine_add_in_place(&mut r, &q)),
-                    -1 => ell_coeffs.push(Self::affine_add_in_place(&mut r, &neg_q)),
-                    _ => continue,
-                }
-            }
-
-            let q1 = mul_by_char(q);
-            let mut q2 = mul_by_char(q1);
-
-            if ark_bn254::Config::X_IS_NEGATIVE {
-                r.y = -r.y;
-            }
-
-            q2.y = -q2.y;
-
-            ell_coeffs.push(Self::affine_add_in_place(&mut r, &q1));
-            ell_coeffs.push(Self::affine_add_in_place(&mut r, &q2));
-
-            Self {
-                ell_coeffs,
-                infinity: false,
-            }
-        }
-    }
-}
-
-impl From<ark_bn254::G2Affine> for G2Prepared {
-    // equal with line_function.
-    fn from(q: ark_bn254::G2Affine) -> Self {
-        if q.infinity {
-            G2Prepared {
-                ell_coeffs: vec![],
-                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,
-            }
-        }
-    }
-}
-
-impl From<ark_bn254::G2Projective> for G2Prepared {
-    fn from(q: ark_bn254::G2Projective) -> Self {
-        q.into_affine().into()
-    }
-}
-
-impl From<ark_G2Prepared<ark_bn254::Config>> for G2Prepared {
-    fn from(q: ark_G2Prepared<ark_bn254::Config>) -> Self {
-        let ell_coeffs: Vec<(ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2)> = q
-            .ell_coeffs
-            .iter()
-            .map(|f| {
-                let f1: ark_bn254::Fq2 = f.0;
-                let f2: ark_bn254::Fq2 = f.1;
-                let f3: ark_bn254::Fq2 = f.2;
-                (f1, f2, f3)
-            })
-            .collect();
-        G2Prepared {
-            ell_coeffs,
-            infinity: false,
-        }
-    }
-}
-
-impl<'a> From<&'a ark_bn254::G2Affine> for G2Prepared {
-    fn from(other: &'a ark_bn254::G2Affine) -> Self {
-        (*other).into()
-    }
-}
-
-impl<'a> From<&'a ark_bn254::G2Projective> for G2Prepared {
-    fn from(q: &'a ark_bn254::G2Projective) -> Self {
-        q.into_affine().into()
-    }
-}
-
-impl<'a> From<&'a ark_G2Prepared<ark_bn254::Config>> for G2Prepared {
-    fn from(q: &'a ark_G2Prepared<ark_bn254::Config>) -> Self {
-        q.to_owned().into()
-    }
-}
-
-pub fn mul_by_char(r: ark_bn254::G2Affine) -> ark_bn254::G2Affine {
-    // multiply by field characteristic
-
-    let mut s = r;
-    s.x.frobenius_map_in_place(1);
-    s.x *= &ark_bn254::Config::TWIST_MUL_BY_Q_X;
-    s.y.frobenius_map_in_place(1);
-    s.y *= &ark_bn254::Config::TWIST_MUL_BY_Q_Y;
-
-    s
-}
-
-#[cfg(test)]
-mod tests {
-    use ark_bn254::{Fq, Fq2};
-
-    use ark_ec::short_weierstrass::SWCurveConfig;
-    use ark_ff::{Field, UniformRand};
-    use ark_std::test_rng;
-    use num_traits::One;
-
-    use super::G2HomProjective;
-    use ark_ff::AdditiveGroup;
-
-    #[test]
-    fn test_double_in_place() {
-        let mut rng = test_rng();
-        let two_inv = Fq::one().double().inverse().unwrap();
-        let mut r = G2HomProjective {
-            x: Fq2::rand(&mut rng),
-            y: Fq2::rand(&mut rng),
-            z: Fq2::rand(&mut rng),
-        };
-
-        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());
-        println!("r.z = {:?}\n\n", r.z.to_string());
-
-        let s = r.double_in_place(&two_inv);
-
-        println!("after double line:");
-        println!("r.x = {:?}", r.x.to_string());
-        println!("r.y = {:?}", r.y.to_string());
-        println!("r.z = {:?}", r.z.to_string());
-        println!("s.0 = {:?}", s.0.to_string());
-        println!("s.1 = {:?}", s.1.to_string());
-        println!("s.2 = {:?}", s.2.to_string());
-    }
-}
diff --git a/src/bn254/fp254impl.rs b/src/bn254/fp254impl.rs
deleted file mode 100644
index efcadca16..000000000
--- a/src/bn254/fp254impl.rs
+++ /dev/null
@@ -1,1832 +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::u29x9::{
-    u29x9_mul_karazuba, u29x9_mul_karazuba_imm, u29x9_mulhi_karazuba_imm, u29x9_mullo_karazuba_imm,
-    u29x9_square,
-};
-use crate::bigint::U254;
-use crate::bn254::fq::Fq;
-use crate::bn254::utils::fq_to_bits;
-use crate::pseudo::OP_256MUL;
-use crate::treepp::*;
-use ark_ff::{BigInteger, PrimeField};
-use bitcoin_script::script;
-use num_bigint::{BigInt, BigUint};
-use num_traits::{Num, One};
-use std::ops::{Add, Div, Mul, Rem, Shl};
-use std::str::FromStr;
-use std::sync::OnceLock;
-
-use super::utils::{fq_push_not_montgomery, Hint};
-
-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 push_u32_le_not_montgomery(v: &[u32]) -> Script {
-        script! {
-            { U254::push_u32_le(&BigUint::from_slice(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)
-    }
-
-    #[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_dec_not_montgomery(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();
-        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_not_montgomery(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 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)
-    }
-
-    #[inline]
-    fn push_one_not_montgomery() -> Script {
-        U254::push_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
-
-                { script! {
-                    // ⋯ 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₀
-                }.add_stack_hint(-2, Self::N_LIMBS as i32 - 2).add_altstack_hint(-2 * Self::N_LIMBS as i32, -2 * Self::N_LIMBS as i32)}
-            }
-        });
-        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₈⁻
-                { script! {
-                    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
-                }.add_stack_hint(-2, Self::N_LIMBS as i32 - 2).add_altstack_hint(-2 * Self::N_LIMBS as i32, -2 * Self::N_LIMBS as i32)}
-                // ⋯ 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
-            { script! {
-                // ⋯ 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
-            }.add_stack_hint(-2, Self::N_LIMBS as i32 - 2).add_altstack_hint(-2 * Self::N_LIMBS as i32, -2 * Self::N_LIMBS as i32)}
-            // ⋯ 2⋅A₈+C₇⁺ 2⋅A₇+C₆⁺ ... 2⋅A₁+C₀⁺ 2⋅A₀
-            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) ... 2⋅A₀-M₀
-        }
-    }
-
-    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_not_montgomery(*constant) }
-            { Fq::tmul() }
-        };
-        hints.push(Hint::BigIntegerTmulLC1(q));
-
-        (script, hints)
-    }
-
-    // TODO: Optimize by using the constant feature
-    fn hinted_mul_by_constant_stable(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_not_montgomery(*constant) }
-            for _ in 0..Self::N_LIMBS {
-                OP_DEPTH OP_1SUB OP_ROLL // hints
-            }
-            { Fq::tmul() }
-        };
-        hints.push(Hint::BigIntegerTmulLC1(q));
-        hints.push(Hint::Fq(*constant));
-
-        (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)
-    }
-
-    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)
-    }
-
-    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)
-    }
-
-    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..=6).contains(&window),
-            "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(
-            ark_ff::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(
-            ark_ff::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(
-            ark_ff::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_keep_element_not_montgomery(a: u32) -> Script {
-        script! {
-            { Self::copy(a) }
-            { Self::is_one_not_montgomery() }
-        }
-    }
-
-    fn is_one_not_montgomery() -> Script {
-        script! {
-            { Self::push_one_not_montgomery() }
-            { Self::equal(1, 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⁻²⁶¹❩₂₆₀…₀
-        }
-    }
-
-    // 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 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 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_not_montgomery() }
-            { Fq::equalverify(1, 0) }
-        };
-        hints.push(Hint::Fq(ark_bn254::Fq::from_str(&y.to_string()).unwrap()));
-        hints.push(Hint::BigIntegerTmulLC1(q));
-
-        (script, hints)
-    }
-
-    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 0ac739df7..000000000
--- a/src/bn254/fq12.rs
+++ /dev/null
@@ -1,1318 +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::{Field, Fp12Config};
-use num_bigint::BigUint;
-use num_traits::{Num, Zero};
-use std::ops::{ShrAssign, Sub};
-
-use super::utils::Hint;
-
-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 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 mut script = script! {};
-        let script_lines = [
-            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),
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-
-        (script, hints)
-    }
-
-    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 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 mut script = script! {};
-
-        let script_lines = [
-            // 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_not_montgomery(),
-            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),
-        ];
-
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-        hints.extend(hint1);
-        hints.extend(hint2);
-
-        (script, hints)
-    }
-
-    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 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 mut script = script! {};
-
-        let script_lines = [
-            // 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),
-        ];
-
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hints1);
-        hints.extend(hints2);
-
-        (script, hints)
-    }
-
-    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 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 mut script = script! {};
-        let script_lines = [
-            Fq6::roll(6),
-            hinted_script1,
-            Fq6::roll(6),
-            hinted_script2,
-            hinted_script3,
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-
-        (script, hints)
-    }
-
-    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::fq12::Fq12;
-    use crate::bn254::utils::{
-        fq12_push, fq12_push_not_montgomery, fq2_push, fq2_push_not_montgomery,
-    };
-    use crate::{execute_script_without_stack_limit, 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;
-
-    #[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_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
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_hinted_mul() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 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);
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { fq12_push_not_montgomery(a) }
-                { fq12_push_not_montgomery(b) }
-                { hinted_mul.clone() }
-                { fq12_push_not_montgomery(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script_without_stack_limit(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!(
-                "Fq12::window_mul: {} @ {} stack",
-                hinted_mul.len(),
-                max_stack
-            );
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_hinted_mul_by_34() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 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, hints) = Fq12::hinted_mul_by_34(a, c3, c4);
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { fq12_push_not_montgomery(a) }
-                { fq2_push_not_montgomery(c3) }
-                { fq2_push_not_montgomery(c4) }
-                { hinted_mul.clone() }
-                { fq12_push_not_montgomery(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!(
-                "Fq6::window_mul: {} @ {} stack",
-                hinted_mul.len(),
-                max_stack
-            );
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_hinted_square() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 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);
-
-            let script = script! {
-                for hint in hints {
-                    { hint.push() }
-                }
-                { fq12_push_not_montgomery(a) }
-                { hinted_square.clone() }
-                { fq12_push_not_montgomery(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            max_stack = max_stack.max(exec_result.stats.max_nb_stack_items);
-            println!(
-                "Fq12::hinted_square: {} @ {} stack",
-                hinted_square.len(),
-                max_stack
-            );
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-                };
-                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_not_montgomery(a) }
-                    { hinted_frobenius_map.clone() }
-                    { fq12_push_not_montgomery(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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-}
diff --git a/src/bn254/fq6.rs b/src/bn254/fq6.rs
deleted file mode 100644
index f111ddd26..000000000
--- a/src/bn254/fq6.rs
+++ /dev/null
@@ -1,1364 +0,0 @@
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fq2::Fq2;
-use crate::treepp::{script, Script};
-use ark_ff::{Field, Fp6Config};
-use num_bigint::BigUint;
-
-use super::utils::Hint;
-
-pub struct Fq6;
-
-impl Fq6 {
-    pub fn add(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-        script! {
-            { Fq2::add(a + 4, b + 4) }
-            { Fq2::add(a + 2, b + 4) }
-            { Fq2::add(a, b + 4) }
-        }
-    }
-
-    pub fn sub(a: u32, b: u32) -> Script {
-        if a > b {
-            script! {
-                { Fq2::sub(a + 4, b + 4) }
-                { Fq2::sub(a + 2, b + 4) }
-                { Fq2::sub(a, b + 4) }
-            }
-        } else {
-            script! {
-                { Fq2::sub(a + 4, b + 4) }
-                { Fq2::sub(a + 4, b + 2) }
-                { Fq2::sub(a + 4, b) }
-            }
-        }
-    }
-
-    pub fn double(a: u32) -> Script {
-        script! {
-            { Fq2::double(a + 4) }
-            { Fq2::double(a + 4) }
-            { Fq2::double(a + 4) }
-        }
-    }
-
-    pub fn equalverify() -> Script {
-        script! {
-            for i in 0..6 {
-                { Fq::equalverify(11 - i * 2, 5 - i) }
-            }
-        }
-    }
-
-    pub fn mul_fq2_by_nonresidue() -> Script {
-        script! {
-            { Fq2::copy(0) }
-            { Fq2::double(0) }
-            { Fq2::double(0) }
-            { Fq2::double(0) }
-            { Fq::copy(3) }
-            { Fq::add(2, 0) }
-            { Fq::copy(2) }
-            { Fq::sub(1, 0) }
-            { Fq::add(2, 1) }
-            { Fq::add(2, 0) }
-        }
-    }
-
-    // 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) }
-
-            // compute p.c1 * c1
-            { Fq2::roll(6) }
-            { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
-
-            // compute p.c2 * c2
-            { Fq2::roll(6) }
-            { Fq2::roll(6) }
-            { Fq2::mul(2, 0) }
-        }
-    }
-
-    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 p.c1 * c1
-            { Fq2::roll(4) }
-            { Fq2::mul_by_constant(constant) }
-
-            // compute p.c2 * c2
-            { Fq2::roll(4) }
-            { Fq2::mul_by_constant(constant) }
-        }
-    }
-
-    pub fn hinted_mul_by_fp2_constant(a: ark_bn254::Fq6, constant: &ark_bn254::Fq2) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        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);
-
-        let mut script = script! {};
-        let script_lines = [
-            // 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,
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-
-        (script, hints)
-    }
-
-    pub fn push_one() -> Script {
-        script! {
-            { Fq2::push_one() }
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-        }
-    }
-
-    pub fn push_zero() -> Script {
-        script! {
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-        }
-    }
-
-    pub fn mul(mut a: u32, mut b: u32) -> Script {
-        // 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 {
-            (a, b) = (b, a);
-        }
-
-        script! {
-            // compute ad = P(0)
-            { Fq2::copy(b + 4) }
-            { Fq2::copy(a + 6) }
-            { Fq2::mul(2, 0) }
-
-            // compute a+c
-            { Fq2::copy(a + 6) }
-            { Fq2::copy(a + 4) }
-            { Fq2::add(2, 0) }
-
-            // compute a+b+c, a-b+c
-            { Fq2::copy(0) }
-            { Fq2::copy(a + 8) }
-            { Fq2::copy(0) }
-            { Fq2::add(4, 0) }
-            { Fq2::sub(4, 2) }
-
-            // compute d+f
-            { Fq2::copy(b + 10) }
-            { Fq2::copy(b + 8) }
-            { Fq2::add(2, 0) }
-
-            // compute d+e+f, d-e+f
-            { Fq2::copy(0) }
-            { Fq2::copy(b + 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) }
-
-            // compute (a-b+c)(d-e+f) = P(-1)
-            { Fq2::mul(4, 2) }
-
-            // compute 2b
-            { Fq2::roll(a + 8) }
-            { Fq2::double(0) }
-
-            // compute 4c
-            { Fq2::copy(a + 8) }
-            { Fq2::double(0) }
-            { Fq2::double(0) }
-
-            // compute a+2b+4c
-            { Fq2::add(2, 0) }
-            { Fq2::roll(a + 10) }
-            { Fq2::add(2, 0) }
-
-            // compute 2e
-            { Fq2::roll(b + 10) }
-            { Fq2::double(0) }
-
-            // compute 4f
-            { Fq2::copy(b + 10) }
-            { Fq2::double(0) }
-            { Fq2::double(0) }
-
-            // compute d+2e+4f
-            { Fq2::add(2, 0) }
-            { Fq2::roll(b + 12) }
-            { Fq2::add(2, 0) }
-
-            // compute (a+2b+4c)(d+2e+4f) = P(2)
-            { Fq2::mul(2, 0) }
-
-            // compute cf = P(inf)
-            { Fq2::roll(b + 8) }
-            { Fq2::roll(a + 4) }
-            { Fq2::mul(2, 0) }
-
-            // // at this point, we have v_0, v_1, v_2, v_3, v_4
-
-            // compute 3v_0
-            { Fq2::triple(8) }
-
-            // compute 3v_1
-            { Fq2::triple(8) }
-
-            // compute 6v_4
-            { Fq2::triple(4) }
-            { Fq2::double(0) }
-
-            // compute x = 3v_0 - 3v_1 - v_2 + v_3 - 12v_4
-            { Fq2::copy(4) }
-            { Fq2::copy(4) }
-            { Fq2::sub(2, 0) }
-            { Fq2::copy(10) }
-            { Fq2::sub(2, 0) }
-            { Fq2::copy(8) }
-            { Fq2::add(2, 0) }
-            { Fq2::copy(2) }
-            { Fq2::double(0) }
-            { Fq2::sub(2, 0) }
-
-            // compute c_0 = 6v_0 + \beta x
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::copy(6) }
-            { Fq2::double(0) }
-            { Fq2::add(2, 0) }
-
-            // compute y = -3v_0 + 6v_1 - 2v_2 - v_3 + 12v_4
-            { Fq2::copy(4) }
-            { Fq2::double(0) }
-            { Fq2::copy(8) }
-            { Fq2::sub(2, 0) }
-            { Fq2::copy(12) }
-            { Fq2::double(0) }
-            { Fq2::sub(2, 0) }
-            { Fq2::roll(10) }
-            { Fq2::sub(2, 0) }
-            { Fq2::copy(4) }
-            { Fq2::double(0) }
-            { Fq2::add(2, 0) }
-
-            // compute c_1 = y + \beta 6v_4
-            { Fq2::copy(4) }
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::add(2, 0) }
-
-            // compute c_2 = 3v_1 - 6v_0 + 3v_2 - 6v_4
-            { Fq2::roll(6) }
-            { Fq2::roll(8) }
-            { Fq2::double(0) }
-            { Fq2::sub(2, 0) }
-            { Fq2::roll(8) }
-            { Fq2::triple(0) }
-            { Fq2::add(2, 0) }
-            { Fq2::sub(0, 6) }
-
-            // divide by 6
-            { Fq2::roll(4) }
-            { Fq2::div2() }
-            { Fq2::div3() }
-            { Fq2::roll(4) }
-            { Fq2::div2() }
-            { Fq2::div3() }
-            { Fq2::roll(4) }
-            { Fq2::div2() }
-            { Fq2::div3() }
-        }
-    }
-
-    pub fn hinted_mul(mut a_depth: u32, mut a: ark_bn254::Fq6, mut b_depth: u32, mut b: ark_bn254::Fq6) -> (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) = 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 mut script = script! {};
-        let script_lines = [
-            // compute ad = P(0)
-            Fq2::copy(a_depth + 4),
-            Fq2::copy(b_depth + 6),
-            hinted_script1,
-
-            // compute a+c
-            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_depth + 8),
-            Fq2::copy(0),
-            Fq2::add(4, 0),
-            Fq2::sub(4, 2),
-
-            // compute d+f
-            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_depth + 12),
-            Fq2::copy(0),
-            Fq2::add(4, 0),
-            Fq2::sub(4, 2),
-
-            // compute (a+b+c)(d+e+f) = P(1)
-            hinted_script2,
-
-            // compute (a-b+c)(d-e+f) = P(-1)
-            hinted_script3,
-
-            // compute 2b
-            Fq2::roll(a_depth + 8),
-            Fq2::double(0),
-
-            // compute 4c
-            Fq2::copy(a_depth + 8),
-            Fq2::double(0),
-            Fq2::double(0),
-
-            // compute a+2b+4c
-            Fq2::add(2, 0),
-            Fq2::roll(a_depth + 10),
-            Fq2::add(2, 0),
-
-            // compute 2e
-            Fq2::roll(b_depth + 10),
-            Fq2::double(0),
-
-            // compute 4f
-            Fq2::copy(b_depth + 10),
-            Fq2::double(0),
-            Fq2::double(0),
-
-            // compute d+2e+4f
-            Fq2::add(2, 0),
-            Fq2::roll(b_depth + 12),
-            Fq2::add(2, 0),
-
-            // compute (a+2b+4c)(d+2e+4f) = P(2)
-            hinted_script4,
-
-            // compute cf = P(inf)
-            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
-
-            // compute 3v_0
-            Fq2::triple(8),
-
-            // compute 3v_1
-            Fq2::triple(8),
-
-            // compute 6v_4
-            Fq2::triple(4),
-            Fq2::double(0),
-
-            // compute x = 3v_0 - 3v_1 - v_2 + v_3 - 12v_4
-            Fq2::copy(4),
-            Fq2::copy(4),
-            Fq2::sub(2, 0),
-            Fq2::copy(10),
-            Fq2::sub(2, 0),
-            Fq2::copy(8),
-            Fq2::add(2, 0),
-            Fq2::copy(2),
-            Fq2::double(0),
-            Fq2::sub(2, 0),
-
-            // compute c_0 = 6v_0 + \beta x
-            Fq6::mul_fq2_by_nonresidue(),
-            Fq2::copy(6),
-            Fq2::double(0),
-            Fq2::add(2, 0),
-
-            // compute y = -3v_0 + 6v_1 - 2v_2 - v_3 + 12v_4
-            Fq2::copy(4),
-            Fq2::double(0),
-            Fq2::copy(8),
-            Fq2::sub(2, 0),
-            Fq2::copy(12),
-            Fq2::double(0),
-            Fq2::sub(2, 0),
-            Fq2::roll(10),
-            Fq2::sub(2, 0),
-            Fq2::copy(4),
-            Fq2::double(0),
-            Fq2::add(2, 0),
-
-            // compute c_1 = y + \beta 6v_4
-            Fq2::copy(4),
-            Fq6::mul_fq2_by_nonresidue(),
-            Fq2::add(2, 0),
-
-            // compute c_2 = 3v_1 - 6v_0 + 3v_2 - 6v_4
-            Fq2::roll(6),
-            Fq2::roll(8),
-            Fq2::double(0),
-            Fq2::sub(2, 0),
-            Fq2::roll(8),
-            Fq2::triple(0),
-            Fq2::add(2, 0),
-            Fq2::sub(0, 6),
-
-            // divide by 6
-            Fq2::roll(4),
-            Fq2::div2(),
-            Fq2::div3(),
-            Fq2::roll(4),
-            Fq2::div2(),
-            Fq2::div3(),
-            Fq2::roll(4),
-            Fq2::div2(),
-            Fq2::div3(),
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-
-        (script, hints)
-    }
-
-    // input:
-    //    p.c0   (2 elements)
-    //    p.c1   (2 elements)
-    //    p.c2   (2 elements)
-    //    c0  (2 elements)
-    //    c1  (2 elements)
-    pub fn mul_by_01() -> Script {
-        script! {
-            // compute a_a = p.c0 * c0
-            { Fq2::copy(8) }
-            { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
-
-            // compute b_b = p.c1 * c1
-            { Fq2::copy(8) }
-            { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
-
-            // compute tmp = p.c1 + p.c2
-            { Fq2::copy(10) }
-            { Fq2::copy(10) }
-            { Fq2::add(2, 0) }
-
-            // t1 = c1 * tmp
-            { Fq2::copy(6) }
-            { Fq2::mul(2, 0) }
-
-            // 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(14) }
-            { Fq2::roll(14) }
-            { Fq2::add(2, 0) }
-
-            // t2 = c0 + c1
-            { Fq2::copy(10) }
-            { Fq2::roll(10) }
-            { Fq2::add(2, 0) }
-
-            // 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) }
-
-            // t3 = t3 - a_a
-            { Fq2::sub(0, 8) }
-
-            // t3 = t3 + b_b
-            { Fq2::add(0, 6) }
-        }
-    }
-
-    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 mut script = script! {};
-        let script_lines = [
-            // compute a_a = p.c0 * c0
-            Fq2::copy(8),
-            Fq2::copy(4),
-            hinted_script1,
-
-            // compute b_b = p.c1 * c1
-            Fq2::copy(8),
-            Fq2::copy(4),
-            hinted_script2,
-
-            // compute tmp = p.c1 + p.c2
-            Fq2::copy(10),
-            Fq2::copy(10),
-            Fq2::add(2, 0),
-
-            // t1 = c1 * tmp
-            Fq2::copy(6),
-            hinted_script3,
-
-            // 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(14),
-            Fq2::roll(14),
-            Fq2::add(2, 0),
-
-            // t2 = c0 + c1
-            Fq2::copy(10),
-            Fq2::roll(10),
-            Fq2::add(2, 0),
-
-            // t2 = t2 * tmp
-            hinted_script4,
-
-            // 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
-            hinted_script5,
-
-            // t3 = t3 - a_a
-            Fq2::sub(0, 8),
-
-            // t3 = t3 + b_b
-            Fq2::add(0, 6),
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-
-        (script, hints)
-
-    }
-
-    // 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) }
-
-            // 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) }
-
-            // 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_square(a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        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);
-
-        let mut script = script! {};
-        let script_lines = [
-            // compute s_0 = a_0 ^ 2
-            Fq2::copy(4),
-            hinted_script1,
-
-            // 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),
-            hinted_script2,
-
-            // 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 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 neg(a: u32) -> Script {
-        script! {
-            { Fq2::neg(a + 4) }
-            { Fq2::neg(a + 4) }
-            { Fq2::neg(a + 4) }
-        }
-    }
-
-    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) }
-
-            // 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) }
-        }
-    }
-
-    pub fn frobenius_map(i: usize) -> Script {
-        script! {
-            { Fq2::roll(4) }
-            { Fq2::frobenius_map(i) }
-            { 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()]) }
-            { 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 hinted_frobenius_map(i: usize, a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
-        let mut hints = Vec::new();
-
-        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()]);
-
-        let mut script = script! {};
-        let script_lines = [
-            Fq2::roll(4),
-            hinted_script1,
-            Fq2::roll(4),
-            hinted_script2,
-            hinted_script3,
-            Fq2::roll(4),
-            hinted_script4,
-            hinted_script5,
-        ];
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-
-        (script, hints)
-    }
-
-    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() }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bn254::fq6::Fq6;
-    use crate::bn254::utils::{fq2_push, fq2_push_not_montgomery, fq6_push, fq6_push_not_montgomery};
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use ark_std::UniformRand;
-    use core::ops::Mul;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use ark_ff::AdditiveGroup;
-
-    #[test]
-    fn test_bn254_fq6_add() {
-        println!("Fq6.add: {} bytes", Fq6::add(6, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        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 script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
-                { Fq6::add(6, 0) }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_sub() {
-        println!("Fq6.sub: {} bytes", Fq6::sub(6, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        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 script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
-                { Fq6::sub(6, 0) }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            run(script);
-
-            let script = script! {
-                { fq6_push(b) }
-                { fq6_push(a) }
-                { Fq6::sub(0, 6) }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_double() {
-        println!("Fq6.double: {} bytes", Fq6::double(0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq6::rand(&mut prng);
-            let c = a.double();
-
-            let script = script! {
-                { fq6_push(a) }
-                { Fq6::double(0) }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_hinted_mul() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 0;
-
-        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);
-
-            let script = script! {
-                for hint in hints { 
-                    { hint.push() }
-                }
-                { fq6_push_not_montgomery(a) }
-                { fq6_push_not_montgomery(b) }
-                { hinted_mul.clone() }
-                { fq6_push_not_montgomery(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq6::hinted_mul: {} @ {} stack", hinted_mul.len(), max_stack);
-        }
-
-    }
-
-    #[test]
-    fn test_bn254_fq6_hinted_mul_by_01() {
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 0;
-
-        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 (hinted_mul, hints) = Fq6::hinted_mul_by_01(a, c0, c1);
-
-            let script = script! {
-                for hint in hints { 
-                    { hint.push() }
-                }
-                { fq6_push_not_montgomery(a) }
-                { fq2_push_not_montgomery(c0) }
-                { fq2_push_not_montgomery(c1) }
-                { hinted_mul.clone() }
-                { fq6_push_not_montgomery(b) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let res = execute_script(script);
-            assert!(res.success);
-
-            max_stack = max_stack.max(res.stats.max_nb_stack_items);
-            println!("Fq6::hinted_mul_by_01: {} @ {} stack", hinted_mul.len(), max_stack);
-        }
-
-    }
-
-    #[test]
-    fn test_bn254_fq6_mul() {
-        println!("Fq6.mul: {} bytes", Fq6::mul(6, 0).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::Fq6::rand(&mut prng);
-            let c = a.mul(&b);
-
-            let script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
-                { Fq6::mul(6, 0) }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            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);
-
-        for _ in 0..1 {
-            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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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 script = script! {
-                { fq6_push(a) }
-                { Fq6::inv() }
-                { fq6_push(b) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            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
-            };
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_hinted_square() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 0;
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq6::rand(&mut prng);
-            let b = a.square();
-
-            let (hinted_square, hints) = Fq6::hinted_square(a);
-
-            let script = script! {
-                for hint in hints { 
-                    { hint.push() }
-                }
-                { fq6_push_not_montgomery(a) }
-                { hinted_square.clone() }
-                { fq6_push_not_montgomery(b) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            max_stack = max_stack.max(exec_result.stats.max_nb_stack_items);
-            println!("Fq6::hinted_square: {} @ {} stack", hinted_square.len(), max_stack);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_frobenius_map() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            for i in 0..6 {
-                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 script = script! {
-                    { fq6_push(a) }
-                    { frobenius_map.clone() }
-                    { fq6_push(b) }
-                    { Fq6::equalverify() }
-                    OP_TRUE
-                };
-            run(script);
-            }
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_hinted_frobenius_map() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            for i in 0..6 {
-                let a = ark_bn254::Fq6::rand(&mut prng);
-                let b = a.frobenius_map(i);
-
-                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! {
-                    for hint in hints { 
-                        { hint.push() }
-                    }
-                    { fq6_push_not_montgomery(a) }
-                    { hinted_frobenius_map.clone() }
-                    { fq6_push_not_montgomery(b) }
-                    { Fq6::equalverify() }
-                    OP_TRUE
-                };
-                let exec_result = execute_script(script);
-                assert!(exec_result.success);
-            }
-        }
-    }
-}
diff --git a/src/bn254/g2_subgroup_check.rs b/src/bn254/g2_subgroup_check.rs
deleted file mode 100644
index 71070d4c8..000000000
--- a/src/bn254/g2_subgroup_check.rs
+++ /dev/null
@@ -1,447 +0,0 @@
-use ark_ec::{AffineRepr, CurveGroup};
-use ark_ff::{AdditiveGroup, Field};
-use std::ops::{Add, Div, Mul, Sub};
-
-use crate::bn254::fq2::Fq2;
-use crate::treepp::*;
-use bitcoin::ScriptBuf;
-
-#[derive(Debug, Default, Clone)]
-pub struct ScriptContext<F: ark_ff::Field> {
-    pub inputs: Vec<F>,
-    pub outputs: Vec<F>,
-    pub auxiliary: Vec<usize>,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct SplitScript {
-    pub script: ScriptBuf,
-    pub input_len: u32,
-    pub output_len: u32,
-}
-
-pub struct PairingNative;
-
-impl PairingNative {
-    // Reference: https://github.com/arkworks-rs/algebra/blob/master/curves/bn254/src/curves/g2.rs#L59
-    // https://github.com/BitVM/BitVM/issues/109
-    pub fn witness_g2_subgroup_check(
-        point: &ark_bn254::g2::G2Affine,
-        constants: [ark_bn254::Fq2; 2],
-        scalar_bit: Vec<bool>,
-    ) -> (bool, Vec<ScriptContext<ark_bn254::Fq2>>) {
-        let mut script_contexts = vec![];
-
-        let mut script_context = ScriptContext::default();
-
-        // Maps (x,y) -> (x^p * (u+9)^((p-1)/3), y^p * (u+9)^((p-1)/2))
-        script_context
-            .inputs
-            .push(point.clone().x().unwrap().to_owned());
-        script_context
-            .inputs
-            .push(point.clone().y().unwrap().to_owned());
-
-        let mut p_times_point = *point;
-        p_times_point.x.frobenius_map_in_place(1);
-        p_times_point.y.frobenius_map_in_place(1);
-
-        p_times_point.x *= constants[0];
-        p_times_point.y *= constants[1];
-
-        script_context
-            .outputs
-            .push(p_times_point.clone().x().unwrap().to_owned());
-        script_context
-            .outputs
-            .push(p_times_point.clone().y().unwrap().to_owned());
-
-        script_contexts.push(script_context);
-
-        let (x_times_point, witness) = Self::witness_split_scalar_mul_g2(point, &scalar_bit);
-
-        assert_eq!(p_times_point, x_times_point);
-
-        script_contexts.extend(witness);
-
-        (true, script_contexts)
-    }
-    pub fn witness_split_scalar_mul_g2(
-        base: &ark_bn254::G2Affine,
-        scalar: &Vec<bool>,
-    ) -> (ark_bn254::G2Affine, Vec<ScriptContext<ark_bn254::Fq2>>) {
-        let res = base.to_owned();
-        let mut tmp = base.to_owned();
-
-        let mut script_contexts = vec![];
-
-        for (i, b) in scalar.iter().skip(1).enumerate() {
-            //if i > 0 {
-
-            let (lambda, miu, res_x, res_y) = PairingNative::line_double_g2(&tmp);
-
-            let mut script_context = ScriptContext::default();
-
-            script_context.inputs.push(lambda);
-            script_context.inputs.push(miu);
-            script_context.inputs.push(tmp.x().unwrap().to_owned());
-            script_context.inputs.push(tmp.y().unwrap().to_owned());
-            script_context.outputs.push(res_x);
-            script_context.outputs.push(res_y);
-
-            tmp = tmp.add(tmp).into_affine();
-
-            assert_eq!(res_x, tmp.x().unwrap().clone());
-            assert_eq!(res_y, tmp.y().unwrap().clone());
-
-            // ecc_double_add_data_set.push(ecc_double_add_data_tmp);
-            script_contexts.push(script_context);
-
-            if *b {
-                let mut script_context = ScriptContext::default();
-
-                let (lambda, miu, res_x, res_y) = PairingNative::line_add_g2(&res, &tmp);
-
-                script_context.inputs.push(lambda);
-                script_context.inputs.push(miu);
-                script_context.inputs.push(res.x().unwrap().to_owned());
-                script_context.inputs.push(res.y().unwrap().to_owned());
-                script_context.inputs.push(tmp.x().unwrap().to_owned());
-                script_context.inputs.push(tmp.y().unwrap().to_owned());
-                script_context.outputs.push(res_x);
-                script_context.outputs.push(res_y);
-
-                tmp = tmp.add(res).into_affine();
-
-                assert_eq!(res_x, tmp.x().unwrap().clone());
-                assert_eq!(res_y, tmp.y().unwrap().clone());
-
-                script_contexts.push(script_context);
-            }
-            //}
-        }
-
-        (tmp, script_contexts)
-    }
-
-    pub fn line_add_g2(
-        point1: &ark_bn254::G2Affine,
-        point2: &ark_bn254::G2Affine,
-    ) -> (
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-    ) {
-        let (x1, y1) = (point1.x, point1.y);
-        let (x2, y2) = (point2.x, point2.y);
-
-        // slope: alpha = (y2-y1)/(x2-x1)
-        let alpha = (y2.sub(y1)).div(x2.sub(x1));
-        // bias = y1 - alpha * x1
-        let bias = y1 - alpha * x1;
-
-        let x3 = alpha.square() - x1 - x2;
-        let y3 = -(bias + alpha * x3);
-
-        (alpha, bias, x3, y3)
-    }
-
-    pub fn line_double_g2(
-        point: &ark_bn254::G2Affine,
-    ) -> (
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-        ark_bn254::Fq2,
-    ) {
-        let (x, y) = (point.x, point.y);
-
-        // slope: alpha = 3 * x ^ 2 / (2 * y)
-        let alpha = x
-            .square()
-            .mul(ark_bn254::Fq2::from(3))
-            .div(y.mul(ark_bn254::Fq2::from(2)));
-        // bias = y - alpha * x
-        let bias = y - alpha * x;
-
-        let x3 = alpha.square() - x.double();
-        let y3 = -(bias + alpha * x3);
-
-        (alpha, bias, x3, y3)
-    }
-}
-pub struct PairingSplitScript;
-
-impl PairingSplitScript {
-    pub fn scalar_mul_split_g2(scalar_bit: Vec<bool>) -> Vec<Script> {
-        let mut script_chunks: Vec<Script> = vec![];
-
-        for i in 1..scalar_bit.len() {
-            script_chunks.push(Self::double_line_g2());
-
-            if scalar_bit[i] {
-                script_chunks.push(Self::add_line_g2());
-            }
-        }
-
-        script_chunks
-    }
-
-    // Stack top: [Q.x, Q.y]
-    // Stack top: [Q.x, Q.y * fro]
-    // Stack top: [Q.x, Q.y * fro * constant_1]
-    // Stack top: [Q.x] | [Q.y * fro * constant_1]
-    // Stack top: [Q.x * fro] | [Q.y * fro * constant_1]
-    // Stack top: [Q.x * fro * constant_0] | [Q.y * fro * constant_1]
-    // Stack top: [Q.x * fro * constant_0, Q.y * fro * constant_1]
-    pub fn g2_subgroup_check(constants: [ark_bn254::Fq2; 2], scalar_bit: Vec<bool>) -> Vec<Script> {
-        let mut res = vec![];
-
-        res.push(script! {
-
-            { Fq2::frobenius_map(1)}
-            { Fq2::mul_by_constant(&constants[1])}
-            { Fq2::toaltstack()}
-            { Fq2::frobenius_map(1)}
-            { Fq2::mul_by_constant(&constants[0])}
-            { Fq2::fromaltstack()}
-
-        });
-
-        res.extend(Self::scalar_mul_split_g2(scalar_bit));
-
-        res
-    } // Stack top: [lamda, mu,   Q.x, Q.y ]
-      // Type:      [Fq2,   Fq2, (Fq2, Fq2)]
-    pub fn double_line_g2() -> Script {
-        script! {
-            // check 2*lamda*y == 3 * q.x^2
-            // [lamda, mu, x, y, y ]
-            { Fq2::copy(0) }
-            // [lamda, mu, x, y, y, lamda ]
-            { Fq2::copy(8) }
-            // [lamda, mu, x, y, y * lamda ]
-            { Fq2::mul(0, 2) }
-            // [lamda, mu, x, y, 2 *y * lamda ]
-            { Fq2::double(0) }
-            // [lamda, mu, x, y] | [ 2 *y * lamda ]
-            { Fq2::toaltstack() }
-            // 2 * lamda * y == 3 * x^2
-            // [lamda, mu, x, y, x] | [ 2 *y * lamda ]
-            { Fq2::copy(2) }
-            // [lamda, mu, x, y, x^2] | [ 2 *y * lamda ]
-            { Fq2::square() }
-            // [lamda, mu, x, y, x^2, x^2] | [ 2 *y * lamda ]
-            { Fq2::copy(0) }
-            // [lamda, mu, x, y, x^2, 2x^2] | [ 2 *y * lamda ]
-            { Fq2::double(0) }
-            // [lamda, mu, x, y, 3x^2] | [ 2 *y * lamda ]
-            { Fq2::add(0, 2) }
-            // [lamda, mu, x, y, 3x^2, 2 *y * lamda ]
-            { Fq2::fromaltstack() }
-            // [lamda, mu, x, y]
-            { Fq2::equalverify() }
-            // check y - lamda * x _ mu == 0
-            // [lamda, mu, x, y, mu]
-            { Fq2::copy(4) }
-            // [lamda, mu, x, y - mu]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x, y - mu, x]
-            { Fq2::copy(2) }
-            // [lamda, mu, x, y - mu, x, lamda]
-            { Fq2::copy(8) }
-            // [lamda, mu, x, y - mu, x * lamda]
-            { Fq2::mul(0, 2) }
-            // [lamda, mu, x, y - mu - x * lamda]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x, y - mu - x * lamda, 0]
-            { Fq2::push_zero() }
-            // [lamda, mu, x]
-            { Fq2::equalverify() }
-            // calcylate x_3 = lamda^2 - 2x
-            // [lamda, mu, x, lamda]
-            { Fq2::copy(4) }
-            // [lamda, mu, x, lamda^2]
-            { Fq2::square() }
-            // [lamda, mu, lamda^2, 2x]
-            { Fq2::double(2) }
-            // [lamda, mu, lamda^2 - 2x]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x3, x3 ]
-            { Fq2::copy(0) }
-            // [mu, x3, lamda * x3 ]
-            { Fq2::mul(0, 6) }
-            // [x3, lamda * x3 + mu ]
-            { Fq2::add(0, 4) }
-            // [x3, y3 ]
-            { Fq2::neg(0) }
-        }
-    }
-
-    // Stack top: [lamda, mu,  Q.x1, Q.y1, Q.x2, Q.y2 ]
-    // Type:      [Fq2,   Fq2, (Fq2, Fq2), (Fq2, Fq2)]
-    pub fn add_line_g2() -> Script {
-        script! {
-            // check y2 - lamda * x2 - mu == 0
-            // [lamda, mu, x1, y1, x2, y2, mu]
-            { Fq2::copy(8) }
-            // [lamda, mu, x1, y1, x2, y2 - mu]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x1, y1, x2, y2 - mu, x2]
-            { Fq2::copy(2) }
-            // [lamda, mu, x1, y1, x2, y2 - mu, x2, lambda]
-            { Fq2::copy(12) }
-            // [lamda, mu, x1, y1, x2, y2 - mu, x2 * lambda]
-            { Fq2::mul(0, 2) }
-            // [lamda, mu, x1, y1, x2, y2 - mu - x2 * lambda]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x1, y1, x2, y2 - mu - x2 * lambda, 0]
-            { Fq2::push_zero() }
-            // [lamda, mu, x1, y1, x2]
-            { Fq2::equalverify() }
-            // check y1 - lamda * x1 - mu == 0
-            // [lamda, mu, x1, y1, x2, mu]
-            { Fq2::copy(6) }
-            // [lamda, mu, x1, x2, y1 - mu]
-            { Fq2::sub(4, 0) }
-            // [lamda, mu, x1, x2, y1 - mu, x1]
-            { Fq2::copy(4) }
-            // [lamda, mu, x1, x2, y1 - mu, x1, lambda]
-            { Fq2::copy(10) }
-            // [lamda, mu, x1, x2, y1 - mu, x1 * lambda]
-            { Fq2::mul(0, 2) }
-            // [lamda, mu, x1, x2, y1 - mu - x1 * lambda]
-            { Fq2::sub(2, 0) }
-            // [lamda, mu, x1, x2, y1 - mu - x2 * lambda, 0]
-            { Fq2::push_zero() }
-            // [lamda, mu, x1, x2]
-            { Fq2::equalverify() }
-            // calcylate x_3 = lamda^2 - x1 - x2
-            // [lamda, mu, x1 + x2]
-            {Fq2::add(0, 2)}
-            // [lamda, mu, x1 + x2, lamda]
-            { Fq2::copy(4) }
-            // [lamda, mu, x1 + x2, lamda^2]
-            { Fq2::square() }
-            // [lamda, mu, lamda^2 - (x1 + x2)]
-            { Fq2::sub(0, 2) }
-            // [lamda, mu, x3, x3 ]
-            { Fq2::copy(0) }
-            // [mu, x3, lamda * x3 ]
-            { Fq2::mul(0, 6) }
-            // [x3, lamda * x3 + mu ]
-            { Fq2::add(0, 4) }
-            // [x3, y3 ]
-            { Fq2::neg(0) }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use std::str::FromStr;
-
-    
-    
-    
-    
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    use ark_ff::UniformRand;
-    use ark_std::end_timer;
-    use ark_std::start_timer;
-    
-    use num_bigint::BigUint;
-    
-    
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    
-    
-
-    #[test]
-    fn test_g2_subgroup_check() {
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-
-            let P_POWER_ENDOMORPHISM_COEFF_0 = ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str("21575463638280843010398324269430826099269044274347216827212613867836435027261").unwrap(),
-                ark_bn254::Fq::from_str("10307601595873709700152284273816112264069230130616436755625194854815875713954").unwrap()
-            );
-
-            // PSI_Y = (u+9)^((p-1)/2) = TWIST_MUL_BY_Q_Y
-            let P_POWER_ENDOMORPHISM_COEFF_1 = ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str("2821565182194536844548159561693502659359617185244120367078079554186484126554").unwrap(),
-                ark_bn254::Fq::from_str("3505843767911556378687030309984248845540243509899259641013678093033130930403").unwrap(),
-            );
-
-            let scalar_bit: Vec<bool> = ark_ff::BitIteratorBE::without_leading_zeros(&[17887900258952609094, 8020209761171036667]).collect();
-
-            let p = ark_bn254::G2Affine::rand(&mut prng);
-
-            let scripts = PairingSplitScript::g2_subgroup_check([P_POWER_ENDOMORPHISM_COEFF_0, P_POWER_ENDOMORPHISM_COEFF_1], scalar_bit.clone());
-
-            println!(
-                "curves::test_g2_subgroup_check script chunk num = {}",
-                scripts.len()
-            );
-
-            // **************** prepare witness data ******************
-
-            let (res, witness) = PairingNative::witness_g2_subgroup_check(&p, [P_POWER_ENDOMORPHISM_COEFF_0, P_POWER_ENDOMORPHISM_COEFF_1], scalar_bit.clone());
-
-            assert!(res);
-
-            println!(
-                "curves::test_g2_subgroup_check witness data len = {}",
-                witness.len()
-            );
-
-            //********** Check ech script chunk with witness data *************//
-
-            // execute for each msm-script and witness
-            for (i, (wit, scp)) in witness.iter().zip(scripts).enumerate() {
-                let final_script = script! {
-                    for input in wit.inputs.iter() {
-                        { Fq::push_u32_le(&BigUint::from(input.c0).to_u32_digits()) }
-                        { Fq::push_u32_le(&BigUint::from(input.c1).to_u32_digits()) }
-                    }
-                    { scp.clone() }
-                    for output in wit.outputs.iter() {
-                        { Fq::push_u32_le(&BigUint::from(output.c0).to_u32_digits()) }
-                        { Fq::push_u32_le(&BigUint::from(output.c1).to_u32_digits()) }
-
-                    }
-                    { Fq::equalverify(4,0) }
-                    { Fq::equalverify(3,0) }
-                    { Fq::equalverify(2,0) }
-                    { Fq::equalverify(1,0) }
-                    OP_TRUE
-                };
-                let start = start_timer!(|| "execute_test_g2_subgroup_check_script");
-                let exec_result = execute_script(final_script);
-                assert!(exec_result.success);
-                println!("subscript[{}] runs successfully!", i);
-                end_timer!(start);
-            }
-        }
-    }
-}
diff --git a/src/bn254/msm.rs b/src/bn254/msm.rs
deleted file mode 100644
index 2dd9b0578..000000000
--- a/src/bn254/msm.rs
+++ /dev/null
@@ -1,678 +0,0 @@
-
-use super::utils::Hint;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::utils::fr_push_not_montgomery;
-use crate::bn254::{curves::G1Affine, curves::G1Projective, utils::fr_push};
-use crate::treepp::*;
-use ark_ec::{AdditiveGroup, AffineRepr, CurveGroup};
-use ark_ff::{BigInteger, Field, PrimeField};
-
-pub fn affine_double_line_coeff(
-    t: &mut ark_bn254::G1Affine,
-) -> (ark_bn254::Fq, ark_bn254::Fq) {
-    // alpha = 3 * t.x ^ 2 / 2 * t.y ^ 2
-    // bias = t.y - alpha * t.x
-    let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y);
-    let bias = t.y - alpha * t.x;
-
-    // update T
-    // T.x = alpha^2 - 2 * t.x
-    // T.y = -bias - alpha * T.x
-    let tx = alpha.square() - t.x - t.x;
-    t.y = -bias - alpha * tx;
-    t.x = tx;
-
-    (alpha, -bias)
-}
-
-pub fn affine_add_line_coeff(
-    t: &mut ark_bn254::G1Affine,
-    p: ark_bn254::G1Affine,
-) -> (ark_bn254::Fq, ark_bn254::Fq) {
-    // alpha = (t.y - q.y) / (t.x - q.x)
-    // bias = t.y - alpha * t.x
-    let alpha = (t.y - p.y) / (t.x - p.x);
-    let bias = t.y - alpha * t.x;
-
-    // update T
-    // T.x = alpha^2 - t.x - q.x
-    // T.y = -bias - alpha * T.x
-    let tx = alpha.square() - t.x - p.x;
-    t.y = -bias - alpha * tx;
-    t.x = tx;
-
-    (alpha, -bias)
-}
-
-pub fn collect_scalar_mul_coeff(
-    base: ark_bn254::G1Affine,
-    scalar: ark_bn254::Fr,
-    i_step: u32,
-) -> (
-    Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-    Vec<ark_bn254::G1Affine>,
-    Vec<ark_bn254::G1Affine>,
-) {
-    if scalar == ark_bn254::Fr::ONE {
-        (vec![], vec![], vec![])
-    } else {
-        // precomputed lookup table (affine)
-        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
-        p_mul.push(ark_bn254::G1Affine::zero());
-        for _ in 1..(1 << i_step) {
-            p_mul.push((*p_mul.last().unwrap() + base).into_affine());
-        }
-
-        // split into chunks
-        let chunks = scalar
-            .into_bigint()
-            .to_bits_be()
-            .iter()
-            .map(|b| if *b { 1_u8 } else { 0_u8 })
-            .skip(256 - crate::bn254::fr::Fr::N_BITS as usize)
-            .collect::<Vec<_>>()
-            .chunks(i_step as usize)
-            .map(|slice| slice.iter().fold(0, |acc, &b| (acc << 1) + b as u32))
-            .collect::<Vec<u32>>();
-        assert!(!chunks.is_empty());
-
-        // query lookup table, then double/add based on that
-        let mut line_coeff = vec![];
-        let mut step_points = vec![];
-        let mut trace = vec![];
-        let mut t = p_mul[chunks[0] as usize];
-        // for check variables
-        let mut acc = ark_bn254::G1Projective::from(p_mul[chunks[0] as usize]);
-        let mut s = ark_ff::BigInt::<4>::from(chunks[0]);
-        trace.push(p_mul[chunks[0] as usize]);
-        chunks.iter().skip(1).enumerate().for_each(|(idx, query)| {
-            let depth = if (idx == chunks.len() - 2)
-                && (crate::bn254::fr::Fr::N_BITS % i_step != 0)
-            {
-                crate::bn254::fr::Fr::N_BITS % i_step
-            } else {
-                i_step
-            };
-            for _ in 0..depth {
-                let tmp = t;
-                let double_coeff = if t.is_zero() {(ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)} else {affine_double_line_coeff(&mut t)};
-                line_coeff.push(double_coeff);
-                step_points.push(tmp);
-                assert_eq!(
-                    tmp.y().unwrap_or(ark_bn254::Fq::ZERO) - double_coeff.0 * tmp.x().unwrap_or(ark_bn254::Fq::ZERO) + double_coeff.1,
-                    ark_bn254::Fq::ZERO
-                );
-                acc.double_in_place();
-                trace.push(acc.into_affine());
-                s <<= 1;
-            }
-
-            let add_coeffs = if p_mul[*query as usize].is_zero() {
-                (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
-            } else if t.is_zero() {
-                t = p_mul[*query as usize];
-                (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
-            } else {
-                affine_add_line_coeff(&mut t, p_mul[*query as usize])
-            };
-            line_coeff.push(add_coeffs);
-            // FOR DEBUG
-            acc += ark_bn254::G1Projective::from(p_mul[*query as usize]);
-            trace.push(acc.into_affine());
-            // TODO: zero point can be ignored
-            // if p_mul[*query as usize] != ark_bn254::G1Projective::ZERO {
-            //     line_coeff.push(affine_add_line_coeff(&mut t, p_mul[*query as usize]));
-            //     // FOR DEBUG
-            //     acc += ark_bn254::G1Projective::from(p_mul[*query as usize]);
-            // }
-
-            // FOR DEBUG
-            s.add_with_carry(&ark_ff::BigInt::<4>::from(*query));
-        });
-        assert_eq!(s, scalar.into_bigint());
-        assert_eq!(acc.into_affine(), (base * scalar).into_affine());
-
-        // return line coefficients of single scalar mul
-        (line_coeff, step_points, trace)
-    }
-}
-
-// line coefficients, denoted as tuple (alpha, bias), for the purpose of affine mode of MSM
-pub fn prepare_msm_input(
-    bases: &[ark_bn254::G1Affine],
-    scalars: &[ark_bn254::Fr],
-    i_step: u32,
-) -> (
-    Vec<(
-        Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-        Vec<ark_bn254::G1Affine>,
-        Vec<ark_bn254::G1Affine>,
-    )>,
-    Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-) {
-    let groups = bases
-        .iter()
-        .zip(scalars)
-        .collect::<Vec<_>>();
-
-    // inner part
-    let inner_coeffs = groups
-        .clone()
-        .into_iter()
-        .map(|(&base, &scalar)| collect_scalar_mul_coeff(base, scalar, i_step))
-        .collect::<Vec<_>>();
-
-    // outer part
-    let mut acc = (*groups[0].0 * *groups[0].1).into_affine();
-    let outer_coeffs = groups
-        .into_iter()
-        .skip(1)
-        .map(|(&base, &scalar)| affine_add_line_coeff(&mut acc, (base * scalar).into_affine()))
-        .collect::<Vec<_>>();
-
-    (inner_coeffs, outer_coeffs)
-}
-
-// 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() }
-    }
-}
-
-pub fn msm_with_constant_bases_affine(
-    bases: &[ark_bn254::G1Affine],
-    scalars: &[ark_bn254::Fr],
-) -> Script {
-    assert_eq!(bases.len(), scalars.len());
-    let len = bases.len();
-    let i_step = 12_u32;
-    let (inner_coeffs, outer_coeffs) = prepare_msm_input(bases, scalars, i_step);
-    script! {
-        for i in 0..len {
-            if scalars[i] != ark_bn254::Fr::ONE {
-                { fr_push(scalars[i]) }
-                { G1Affine::scalar_mul_by_constant_g1(bases[i], inner_coeffs[i].0.clone(), inner_coeffs[i].1.clone(), inner_coeffs[i].2.clone()) }
-            } else {
-                { G1Affine::push(bases[i]) }
-            }
-            // check coeffs before using
-            if i > 0 {
-                { G1Affine::check_add(outer_coeffs[i - 1].0, outer_coeffs[i - 1].1) }
-            }
-        }
-        // into_affine involving extreem expensive field inversion, X/Z^2 and Y/Z^3, fortunately there's no need to do into_affine any more here
-    }
-}
-
-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 len = bases.len();
-    let i_step = 12_u32;
-    let (inner_coeffs, outer_coeffs) = prepare_msm_input(bases, scalars, i_step);
-
-    let mut hints = Vec::new();
-    let mut hinted_scripts = Vec::new();
-
-    // 1. init the sum=0;
-    // let mut p = ark_bn254::G1Affine::zero();
-    let mut p = (bases[0] * scalars[0]).into_affine();
-    for i in 0..len {
-        let mut c = bases[i];
-        if scalars[i] != ark_bn254::Fr::ONE {
-            let (hinted_script, hint) = G1Affine::hinted_scalar_mul_by_constant_g1(
-                scalars[i],
-                &mut c,
-                inner_coeffs[i].0.clone(),
-                inner_coeffs[i].1.clone(),
-                inner_coeffs[i].2.clone(),
-            );
-            println!("scalar mul {}: {}", i, hinted_script.len());
-            hinted_scripts.push(hinted_script);
-            hints.extend(hint);
-        }
-
-        // check coeffs before using
-        if i > 0 {
-            let (hinted_script, hint) =
-                G1Affine::hinted_check_add(p, c, outer_coeffs[i - 1].0); // outer_coeffs[i - 1].1
-            hinted_scripts.push(hinted_script);
-            hints.extend(hint);
-            p = (p + c).into_affine();
-        }
-    }
-
-    let mut hinted_scripts_iter = hinted_scripts.into_iter();
-    let mut script_lines = Vec::new();
-
-    // 1. init the sum = base[0] * scalars[0];
-    // script_lines.push(G1Affine::push_not_montgomery((bases[0] * scalars[0]).into_affine()));
-    for i in 0..len {
-        // 2. scalar mul
-        if scalars[i] != ark_bn254::Fr::ONE {
-            script_lines.push(fr_push_not_montgomery(scalars[i]));
-            script_lines.push(hinted_scripts_iter.next().unwrap());
-        } else {
-            script_lines.push(G1Affine::push_not_montgomery(bases[i]));
-        }
-        // 3. sum the base
-        if i > 0 {
-            script_lines.push(hinted_scripts_iter.next().unwrap());
-        }
-    }
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-
-    (script, hints)
-    // into_affine involving extreem expensive field inversion, X/Z^2 and Y/Z^3, fortunately there's no need to do into_affine any more here
-}
-
-// 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() }
-        }
-        // convert into Affine
-        { G1Projective::into_affine() }
-    }
-}
-
-pub fn hinted_msm_with_constant_bases(
-    bases: &[ark_bn254::G1Affine],
-    scalars: &[ark_bn254::Fr],
-) -> (Script, Vec<Hint>) {
-    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 mut hints = Vec::new();
-    let mut hinted_scripts = Vec::new();
-
-    // 1. init the sum=0;
-    let mut p = ark_bn254::G1Projective::ZERO;
-    for i in 0..len {
-        // 2. scalar mul
-        let mut c = bases[i];
-        if scalars[i] != ark_bn254::Fr::ONE {
-            let (hinted_script, hint) =
-                G1Projective::hinted_scalar_mul_by_constant_g1(scalars[i], &mut c);
-            hinted_scripts.push(hinted_script);
-            hints.extend(hint);
-        }
-        // 3. sum the base
-        let (hinted_script, hint) = G1Projective::hinted_add(p, c);
-        hinted_scripts.push(hinted_script);
-        hints.extend(hint);
-        p += c;
-    }
-    // convert into Affine
-    let (hinted_script, hint) = G1Projective::hinted_into_affine(p);
-    hinted_scripts.push(hinted_script);
-    hints.extend(hint);
-
-    let mut hinted_scripts_iter = hinted_scripts.into_iter();
-    let mut script_lines = Vec::new();
-
-    // 1. init the sum=0;
-    script_lines.push(G1Projective::push_zero());
-    for i in 0..len {
-        // 2. scalar mul
-        if scalars[i] != ark_bn254::Fr::ONE {
-            script_lines.push(fr_push_not_montgomery(scalars[i]));
-            script_lines.push(hinted_scripts_iter.next().unwrap());
-        } else {
-            script_lines.push(G1Projective::push_not_montgomery(bases[i]));
-        }
-        // 3. sum the base
-        script_lines.push(hinted_scripts_iter.next().unwrap());
-    }
-    // convert into Affine
-    script_lines.push(hinted_scripts_iter.next().unwrap());
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-
-    (script, hints)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::utils::g1_affine_push_not_montgomery;
-    use crate::bn254::{curves::G1Affine, utils::g1_affine_push};
-    use crate::execute_script_without_stack_limit;
-    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");
-        run(script);
-        end_timer!(start);
-    }
-
-    #[test]
-    fn test_msm_with_constant_bases_projective() {
-        let k = 1;
-        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_projective: = {} bytes", msm.len());
-        let start = start_timer!(|| "execute_msm_script");
-        run(script);
-        end_timer!(start);
-    }
-
-    #[test]
-    fn test_msm_with_constant_bases_affine() {
-        let k = 1;
-        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_affine(&bases, &scalars);
-
-        let script = script! {
-            { msm.clone() }
-            { g1_affine_push(expect) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_msm_with_constant_bases_affine_small_scalars() {
-        let k = 1;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-
-        let scalars = (0..n).map(|_| {
-            let mut u = ark_bn254::Fr::rand(rng).into_bigint();
-            for _ in 0..20 {
-                u.div2();
-            }
-            ark_bn254::Fr::from_bigint(u).unwrap()
-        }).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_affine(&bases, &scalars);
-
-        let script = script! {
-            { msm.clone() }
-            { g1_affine_push(expect) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_scalar_mul_projective() {
-        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))
-            .collect::<Vec<_>>();
-
-        let scalar_mul_projective_script =
-            crate::bn254::curves::G1Projective::scalar_mul_by_constant_g1(bases[0]);
-
-        let script = script! {
-            { fr_push(scalars[0]) }
-            { scalar_mul_projective_script.clone() }
-            { crate::bn254::curves::G1Projective::into_affine() }
-            { crate::bn254::curves::G1Affine::push((bases[0] * scalars[0]).into_affine()) }
-            { crate::bn254::curves::G1Affine::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-
-        println!(
-            "script size of scalar_mul_projective: {}",
-            scalar_mul_projective_script.len()
-        );
-    }
-
-    #[test]
-    fn test_scalar_mul_affine() {
-        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 (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-        let scalar_mul_affine_script = crate::bn254::curves::G1Affine::scalar_mul_by_constant_g1(
-            bases[0],
-            inner_coeffs[0].0.clone(),
-            inner_coeffs[0].1.clone(),
-            inner_coeffs[0].2.clone(),
-        );
-
-        let script = script! {
-            { fr_push(scalars[0]) }
-            { scalar_mul_affine_script.clone() }
-            { crate::bn254::curves::G1Affine::push((bases[0] * scalars[0]).into_affine()) }
-            { crate::bn254::curves::G1Affine::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result.final_stack);
-        assert!(exec_result.success);
-
-        println!(
-            "script size of scalar_mul_affine: {}",
-            scalar_mul_affine_script.len()
-        );
-    }
-
-    #[test]
-    fn test_hinted_msm_with_constant_bases_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 (msm, hints) = hinted_msm_with_constant_bases(&bases, &scalars);
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-
-            { msm.clone() }
-            { g1_affine_push_not_montgomery(expect) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-        end_timer!(start);
-
-        println!("hinted_msm_with_constant_bases: = {} bytes", msm.len());
-        let start = start_timer!(|| "execute_msm_script");
-        let exec_result = execute_script_without_stack_limit(script);
-        end_timer!(start);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_hinted_msm_with_constant_bases_affine_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 (msm, hints) = hinted_msm_with_constant_bases_affine(&bases, &scalars);
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-
-            { msm.clone() }
-            { g1_affine_push_not_montgomery(expect) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-        end_timer!(start);
-
-        println!("hinted_msm_with_constant_bases: = {} bytes", msm.len());
-        let start = start_timer!(|| "execute_msm_script");
-        let exec_result = execute_script_without_stack_limit(script);
-        end_timer!(start);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_demo() {
-        
-
-        // let script = script! {
-        //     { crate::bn254::fr::Fr::push_dec("7") }
-        //     { crate::bn254::fr::Fr::decode_montgomery() }
-        //     { crate::bn254::fr::Fr::convert_to_le_bits() }
-        //     // { crate::bn254::fr::Fr::convert_to_le_bits_toaltstack() }
-        // };
-        // let exec_result = execute_script_without_stack_limit(script);
-        // println!("{:?}", exec_result.final_stack);
-        // let a = ark_ff::BigInt::<4>::from([3_u32, 5_u32, 7_u32, 9_u32]);
-        // println!("{:?}", a.to_bits_le());
-    }
-}
diff --git a/src/bn254/pairing.rs b/src/bn254/pairing.rs
deleted file mode 100644
index 0fc6fb464..000000000
--- a/src/bn254/pairing.rs
+++ /dev/null
@@ -1,1455 +0,0 @@
-#![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::utils::*;
-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 {
-    // 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 {
-                    { ell_by_constant_affine(constant_iter.next().unwrap()) }
-                } else {
-                    { 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 {
-                        { ell_by_constant_affine(constant_iter.next().unwrap()) }
-                    } else {
-                        { ell_by_constant(constant_iter.next().unwrap()) }
-                    }
-                }
-            }
-
-            { Fq2::copy(12) }
-            if is_affine {
-                { ell_by_constant_affine(constant_iter.next().unwrap()) }
-            } else {
-                { ell_by_constant(constant_iter.next().unwrap()) }
-            }
-            { Fq2::roll(12) }
-            if is_affine {
-                { ell_by_constant_affine(constant_iter.next().unwrap()) }
-            } else {
-                { 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) }
-                { ell_by_constant(constant_1_iter.next().unwrap()) }
-
-                { Fq2::copy(12) }
-                { 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) }
-                    { ell_by_constant(constant_1_iter.next().unwrap()) }
-
-                    { Fq2::copy(12) }
-                    { ell_by_constant(constant_2_iter.next().unwrap()) }
-                }
-            }
-
-            { Fq2::copy(14) }
-            { ell_by_constant(constant_1_iter.next().unwrap()) }
-
-            { Fq2::copy(12) }
-            { ell_by_constant(constant_2_iter.next().unwrap()) }
-
-            { Fq2::roll(14) }
-            { ell_by_constant(constant_1_iter.next().unwrap()) }
-
-            { Fq2::roll(12) }
-            { 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 {
-                    { ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-                } else {
-                    { ell_by_constant(constant_1_iter.next().unwrap()) }
-                }
-
-                { Fq2::copy(48) }
-                if affine {
-                    { ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-                } else {
-                    { 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 {
-                        { ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-                    } else {
-                        { ell_by_constant(constant_1_iter.next().unwrap()) }
-                    }
-
-                    { Fq2::copy(48) }
-                    if affine {
-                        { ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-                    } else {
-                        { 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 {
-                { ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-            } else {
-                { ell_by_constant(constant_1_iter.next().unwrap()) }
-            }
-
-            { Fq2::copy(12) }
-            if affine {
-                { ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-            } else {
-                { ell_by_constant(constant_2_iter.next().unwrap()) }
-            }
-
-            // update f (frobenius map): f = f * add_line_eval([-p^2])
-            { Fq2::roll(14) }
-            if affine {
-                { ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-            } else {
-                { ell_by_constant(constant_1_iter.next().unwrap()) }
-            }
-
-            { Fq2::roll(12) }
-            if affine {
-                { ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-            } else {
-                { 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 = 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
-                    { 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)]
-                        { 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)]
-                        { 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
-                        { 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) }
-                            }
-                            { 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)]
-                            { 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)]
-                { 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)]
-                    { 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)]
-                    { 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) }
-                { 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
-                    { 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
-    }
-
-    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 in 0..num_line_groups {
-                let p = p_lst[j];
-                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(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 in 0..num_line_groups {
-                    let p = p_lst[j];
-                    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(
-                        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 in 0..num_line_groups {
-            let p = p_lst[j];
-            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(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 in 0..num_line_groups {
-            let p = p_lst[j];
-            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(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 mut script_lines = Vec::new();
-
-        // [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
-        script_lines.push(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
-            script_lines.push(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
-                script_lines.push(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
-                script_lines.push(scripts_iter.next().unwrap());
-            } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                // copy c
-                script_lines.push(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
-                script_lines.push(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..num_line_groups {
-                // copy P_j(p1, p2, p3, p4) to stack
-                script_lines.push(Fq2::copy((26 + 36 - j * 2) as u32));
-                // update f with double line evaluation
-                script_lines.push(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
-                    script_lines.push(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)]
-                    script_lines.push(Fq2::copy(2));
-                    script_lines.push(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)]
-                    script_lines.push(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)]
-
-                    // update T4
-                    // drop T4.y, leave T4.x
-                    script_lines.push(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)]
-                    script_lines.push(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)]
-                    script_lines.push(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
-                    script_lines.push(Fq2::copy((26 + 36 - j * 2) as u32));
-                    // update f with adding line evaluation
-                    script_lines.push(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 {
-                        script_lines.push(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
-                        script_lines.push(Fq2::copy(2));
-                        script_lines.push(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
-                        script_lines.push(Fq2::copy(10 + 36));
-                        script_lines.push(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 {
-                            script_lines.push(Fq2::neg(0));
-                        }
-                        script_lines.push(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)]
-
-                        // update T4
-                        // drop T4.y, leave T4.x
-                        script_lines.push(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
-                        script_lines.push(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)]
-                        script_lines.push(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)]
-                        script_lines.push(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}
-        script_lines.push(Fq12::roll(28));
-        script_lines.push(Fq12::copy(0));
-        script_lines.push(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)]
-        script_lines.push(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)]
-        script_lines.push(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)]
-        script_lines.push(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)]
-        script_lines.push(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)]
-        script_lines.push(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)]
-
-        script_lines.push(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)]
-        script_lines.push(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)]
-        script_lines.push(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
-        script_lines.push(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)]
-        script_lines.push(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..num_line_groups {
-            // copy P_j(p1, p2, p3, p4) to stack
-            script_lines.push(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)]
-            script_lines.push(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 {
-                script_lines.push(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}
-                script_lines.push(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)]
-                script_lines.push(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)]
-                script_lines.push(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)]
-                script_lines.push(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}
-                script_lines.push(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)]
-                script_lines.push(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)]
-                script_lines.push(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)]
-                script_lines.push(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
-                script_lines.push(Fq2::copy(6));
-                script_lines.push(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)]
-                script_lines.push(Fq2::copy(6));
-                script_lines.push(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)]
-                script_lines.push(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)]
-
-                // update T4
-                script_lines.push(Fq2::drop());
-                // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4).x(2) | f(12)]
-                script_lines.push(Fq2::toaltstack());
-                // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | phi(Q4).x(2), f(12)]
-                script_lines.push(Fq2::drop());
-                // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2) | phi(Q4).x(2), f(12)]
-                script_lines.push(Fq2::fromaltstack());
-                // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2), phi(Q4).x(2) | f(12)]
-                script_lines.push(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)]
-                script_lines.push(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)
-            script_lines.push(Fq2::roll((26 - j * 2) as u32));
-            script_lines.push(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 {
-                script_lines.push(Fq12::toaltstack());
-                // [beta_22(2), Q4(4), T4(4) | f(12)]
-                script_lines.push(Fq2::roll(8));
-                // [Q4(4), T4(4), beta_22(2) | f(12)]
-                script_lines.push(Fq2::roll(8));
-                // [Q4.y(2), T4(4), beta_22(2), Q4.x(2) | f(12)]
-                script_lines.push(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)]
-                script_lines.push(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
-                script_lines.push(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)]
-                script_lines.push(Fq12::fromaltstack());
-                // [f(12)]
-            }
-        }
-
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        (script, hints)
-    }
-}
-
-#[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::{
-        fq12_push, fq12_push_not_montgomery, fq2_push, fq2_push_not_montgomery, from_eval_point,
-        hinted_from_eval_point,
-    };
-    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! {
-                { from_eval_point(p) }
-                { miller_loop.clone() }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            run(script);
-        }
-    }
-
-    #[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! {
-            { from_eval_point(p) }
-            // [-p.x / p.y, 1 / p.y]
-            { 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
-        };
-        run(script);
-    }
-
-    #[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
-            { from_eval_point(p1) }
-            { from_eval_point(p2) }
-            { from_eval_point(p3) }
-            { 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
-        };
-        run(script);
-    }
-
-    #[test]
-    fn test_hinted_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 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 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! {
-            for hint in hints {
-                { hint.push() }
-            }
-
-            // beta_12
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("21575463638280843010398324269430826099269044274347216827212613867836435027261").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("10307601595873709700152284273816112264069230130616436755625194854815875713954").unwrap().to_u32_digits()) }
-            // beta_13
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("2821565182194536844548159561693502659359617185244120367078079554186484126554").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("3505843767911556378687030309984248845540243509899259641013678093033130930403").unwrap().to_u32_digits()) }
-            // beta_22
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("21888242871839275220042445260109153167277707414472061641714758635765020556616").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from_str("0").unwrap().to_u32_digits()) }
-
-            // p1, p2, p3, p4
-            { from_eval_p1 }
-            { from_eval_p2 }
-            { from_eval_p3 }
-            { from_eval_p4 }
-
-            // q4
-            { fq2_push_not_montgomery(q4.x) }
-            { fq2_push_not_montgomery(q4.y) }
-
-            // c, c_inv, wi
-            { fq12_push_not_montgomery(c) }
-            { fq12_push_not_montgomery(c_inv) }
-            { fq12_push_not_montgomery(wi) }
-
-            // t4
-            { fq2_push_not_montgomery(t4.x) }
-            { fq2_push_not_montgomery(t4.y) }
-
-            { quad_miller_loop_affine_script }
-
-            { fq12_push_not_montgomery(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(),
-            );
-        }
-        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
-        };
-        run(script);
-    }
-}
diff --git a/src/bn254/utils.rs b/src/bn254/utils.rs
deleted file mode 100644
index 9685a375b..000000000
--- a/src/bn254/utils.rs
+++ /dev/null
@@ -1,1742 +0,0 @@
-use crate::bigint::BigIntImpl;
-// utils for push fields into stack
-use crate::bn254::ell_coeffs::EllCoeff;
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::bn254::fq::bigint_to_u32_limbs;
-use crate::bn254::fr::Fr;
-use crate::bn254::{fq12::Fq12, fq2::Fq2};
-use ark_ec::{bn::BnConfig, AffineRepr};
-use ark_ff::Field;
-use ark_ff::{AdditiveGroup, BigInt};
-use num_bigint::BigUint;
-
-use crate::{
-    bn254::{fp254impl::Fp254Impl, fq::Fq},
-    treepp::*,
-};
-
-pub fn fr_push(scalar: ark_bn254::Fr) -> Script {
-    script! {
-        { Fr::push_u32_le(&BigUint::from(scalar).to_u32_digits()) }
-    }
-}
-
-pub fn fr_push_not_montgomery(scalar: ark_bn254::Fr) -> Script {
-    script! {
-        { Fr::push_u32_le_not_montgomery(&BigUint::from(scalar).to_u32_digits()) }
-    }
-}
-
-pub fn fq_push(element: ark_bn254::Fq) -> Script {
-    script! {
-        { Fq::push_u32_le(&BigUint::from(element).to_u32_digits()) }
-    }
-}
-
-pub fn fq_push_not_montgomery(element: ark_bn254::Fq) -> Script {
-    script! {
-        { Fq::push_u32_le_not_montgomery(&BigUint::from(element).to_u32_digits()) }
-    }
-}
-
-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 fq2_push_not_montgomery(element: ark_bn254::Fq2) -> Script {
-    script! {
-        { Fq::push_u32_le_not_montgomery(&BigUint::from(element.c0).to_u32_digits()) }
-        { Fq::push_u32_le_not_montgomery(&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 fq6_push_not_montgomery(element: ark_bn254::Fq6) -> Script {
-    script! {
-        for elem in element.to_base_prime_field_elements() {
-            { Fq::push_u32_le_not_montgomery(&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 fq12_push_not_montgomery(element: ark_bn254::Fq12) -> Script {
-    script! {
-        for elem in element.to_base_prime_field_elements() {
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(elem).to_u32_digits()) }
-       }
-    }
-}
-
-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()) }
-    }
-}
-
-pub fn g1_affine_push_not_montgomery(point: ark_bn254::G1Affine) -> Script {
-    script! {
-        { Fq::push_u32_le_not_montgomery(&BigUint::from(point.x).to_u32_digits()) }
-        { Fq::push_u32_le_not_montgomery(&BigUint::from(point.y).to_u32_digits()) }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum Hint {
-    Fq(ark_bn254::Fq),
-    BigIntegerTmulLC1(num_bigint::BigInt),
-    BigIntegerTmulLC2(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();
-        pub type T1 = BigIntImpl<{ K1.0 }, { K1.1 }>;
-        pub type T2 = BigIntImpl<{ K2.0 }, { K2.1 }>;
-        match self {
-            Hint::Fq(fq) => script! {
-                { fq_push_not_montgomery(*fq) }
-            },
-            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)) }
-            },
-        }
-    }
-}
-
-// 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 hinted_ell_by_constant_affine(
-    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_script1, hint1) = Fq::hinted_mul_by_constant(x, &constant.1.c0);
-    let (hinted_script2, hint2) = Fq::hinted_mul_by_constant(x, &constant.1.c1);
-    let (hinted_script3, hint3) = Fq::hinted_mul_by_constant(y, &constant.2.c0);
-    let (hinted_script4, hint4) = Fq::hinted_mul_by_constant(y, &constant.2.c1);
-    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 script_lines = vec![
-        // [f, x', y']
-        // update c1, c1' = x' * c1
-        Fq::copy(1),
-        hinted_script1,
-        // [f, x', y', x' * c1.0]
-        Fq::roll(2),
-        hinted_script2,
-        // [f, y', x' * c1.0, x' * c1.1]
-        // [f, y', x' * c1]
-
-        // update c2, c2' = -y' * c2
-        Fq::copy(2),
-        hinted_script3, // Fq::mul_by_constant(&constant.2.c0),
-        // [f, y', x' * c1, y' * c2.0]
-        Fq::roll(3),
-        hinted_script4,
-        // [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
-        hinted_script5,
-        // [f]
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-    hints.extend(hint1);
-    hints.extend(hint2);
-    hints.extend(hint3);
-    hints.extend(hint4);
-    hints.extend(hint5);
-
-    (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 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 func (params):
-///      p.x, p.y
-/// 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) = Fq::hinted_mul(2, py_inv, 0, p.y);
-    let (hinted_script2, hint2) = Fq::hinted_mul(2, py_inv, 0, -p.x);
-    let script_lines = vec![
-        Fq::push_u32_le_not_montgomery(&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_not_montgomery(&BigUint::from(p.y).to_u32_digits()),
-        // [1/y, 1/y, y]
-        hinted_script1,
-        // [1/y, 1]
-        Fq::push_one_not_montgomery(),
-        // [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_not_montgomery(&BigUint::from(p.x).to_u32_digits()),
-        // [1/y, 1/y, x]
-        Fq::neg(0),
-        // [1/y, 1/y, -x]
-        hinted_script2,
-        // [1/y, -x/y]
-        Fq::roll(1),
-        // [-x/y, 1/y]
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-    hints.extend(hint1);
-    hints.extend(hint2);
-
-    (script, hints)
-}
-
-/// 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 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']
-    }
-}
-
-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 script0 = script! {
-        for _ in 0..<Fq as crate::bn254::fp254impl::Fp254Impl>::N_LIMBS {
-            OP_DEPTH OP_1SUB OP_ROLL // hints
-        }
-    };
-    let script_lines = vec![
-        // [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_not_montgomery(c3),
-        script0.clone(),
-        script0.clone(),
-        Fq2::copy(0),
-        // [-T.x - Q.x, alpha]
-        // fq2_push_not_montgomery(c3.square()),
-        hinted_script0,
-        // [-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']
-        hinted_script1,
-        // [x', alpha * x']
-        Fq2::neg(0),
-        // [x', -alpha * x']
-        // fq2_push_not_montgomery(c4),
-        script0.clone(),
-        script0.clone(),
-        // [x', -alpha * x', -bias]
-        // compute y' = -bias - alpha * x'
-        Fq2::add(2, 0),
-        // [x', y']
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-    hints.push(Hint::Fq(c3.c0));
-    hints.push(Hint::Fq(c3.c1));
-    hints.extend(hint0);
-    hints.extend(hint1);
-    hints.push(Hint::Fq(c4.c0));
-    hints.push(Hint::Fq(c4.c1));
-
-    (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 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']
-    }
-}
-
-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 script0 = script! {
-        for _ in 0..<Fq as crate::bn254::fp254impl::Fp254Impl>::N_LIMBS {
-            OP_DEPTH OP_1SUB OP_ROLL // hints
-        }
-    };
-    let script_lines = vec![
-        Fq2::double(0),
-        Fq2::neg(0),
-        // [- 2 * T.x]
-        // fq2_push_not_montgomery(c3),
-        script0.clone(),
-        script0.clone(),
-        Fq2::copy(0),
-        // fq2_push_not_montgomery(c3.square()),
-        hinted_script0,
-        // [- 2 * T.x, alpha, alpha^2]
-        Fq2::add(4, 0),
-        Fq2::copy(0),
-        // [alpha, x', x']
-        hinted_script1,
-        Fq2::neg(0),
-        // [x', -alpha * x']
-        // fq2_push_not_montgomery(c4),
-        script0.clone(),
-        script0.clone(),
-        Fq2::add(2, 0),
-        // [x', y']
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-
-    hints.push(Hint::Fq(c3.c0));
-    hints.push(Hint::Fq(c3.c1));
-    hints.extend(hint0);
-    hints.extend(hint1);
-    hints.push(Hint::Fq(c4.c0));
-    hints.push(Hint::Fq(c4.c1));
-
-    (script, 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 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() }
-    }
-}
-
-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_stable(x, &c3);
-
-    let script0 = script! {
-        for _ in 0..<Fq as crate::bn254::fp254impl::Fp254Impl>::N_LIMBS {
-            OP_DEPTH OP_1SUB OP_ROLL // hints
-        }
-    };
-
-    let script_lines = vec![
-        // [x, y]
-        Fq2::roll(2),
-        // [y, x]
-        hinted_script1,
-        // [y, alpha * x]
-        Fq2::neg(0),
-        // [y, -alpha * x]
-        Fq2::add(2, 0),
-        // [y - alpha * x]
-        // fq2_push_not_montgomery(c4),
-        script0.clone(),
-        script0.clone(),
-        // [y - alpha * x, -bias]
-        Fq2::add(2, 0),
-        // [y - alpha * x - bias]
-        Fq2::push_zero(),
-        // [y - alpha * x - bias, 0]
-        Fq2::equalverify(),
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-    hints.extend(hint1);
-    hints.push(Hint::Fq(c4.c0));
-    hints.push(Hint::Fq(c4.c1));
-
-
-    (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 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) }
-        // []
-    }
-}
-
-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_stable(t.y.double(), &c3);
-    let (hinted_script2, hint2) = Fq2::hinted_square(t.x);
-    let (hinted_script3, hint3) = hinted_check_line_through_point(t.x, c3, c4);
-
-    let script_lines = vec![
-        // alpha * (2 * T.y) = 3 * T.x^2
-        Fq2::copy(0),
-        Fq2::double(0),
-        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]
-
-        // check: T.y - alpha * T.x - bias = 0
-        hinted_script3,
-        // []
-    ];
-
-    let mut script = script! {};
-    for script_line in script_lines {
-        script = script.push_script(script_line.compile());
-    }
-    hints.extend(hint1);
-    hints.extend(hint2);
-    hints.extend(hint3);
-
-    (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 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) }
-        // []
-    }
-}
-
-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 (mut script, hint1) = hinted_check_line_through_point(q.x, c3, c4);
-    let (script2, hint2) = hinted_check_line_through_point(t.x, c3, c4);
-
-    script = script.push_script(script2.compile());
-
-    hints.extend(hint1);
-    hints.extend(hint2);
-
-    (script, hints)
-}
-
-// 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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-            };
-            run(script);
-        }
-    }
-
-    #[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
-        };
-        run(script);
-    }
-
-    #[test]
-    fn test_hinted_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 (from_eval_point_script, hints_eval) = hinted_from_eval_point(p);
-        let (ell_by_constant_affine_script, hints) = hinted_ell_by_constant_affine(
-            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_not_montgomery(f) }
-            { from_eval_point_script }
-            { ell_by_constant_affine_script.clone() }
-            { fq12_push_not_montgomery(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
-        };
-        run(script);
-    }
-
-    #[test]
-    fn test_hinted_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_from_eval_point(p);
-        let script = script! {
-            for tmp in hints {
-                { tmp.push() }
-            }
-            { ell_by_constant_affine_script.clone() }
-            { Fq::push_u32_le_not_montgomery(&BigUint::from(-p.x / p.y).to_u32_digits()) }
-            { Fq::push_u32_le_not_montgomery(&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]
-        };
-        run(script);
-    }
-
-    #[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_not_montgomery(t.x) }
-            { fq2_push_not_montgomery(q.x) }
-            { hinted_add_line.clone() }
-            // [x']
-            { fq2_push_not_montgomery(y) }
-            // [x', y', y]
-            { Fq2::equalverify() }
-            // [x']
-            { fq2_push_not_montgomery(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_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]
-        };
-        run(script);
-    }
-
-    #[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_not_montgomery(t.x) }
-            { hinted_double_line }
-            // [x']
-            { fq2_push_not_montgomery(y) }
-            // [x', y', y]
-            { Fq2::equalverify() }
-            // [x']
-            { fq2_push_not_montgomery(x) }
-            // [x', x]
-            { Fq2::equalverify() }
-            // []
-            OP_TRUE
-            // [OP_TRUE]
-        };
-        assert!(execute_script(script).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);
-
-        println!(
-            "check_line: {} @ {} stack",
-            check_line_through_point(alpha, bias_minus).len(),
-            exec_result.stats.max_nb_stack_items
-        );
-    }
-
-    #[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_line_through_point(t.x, alpha, bias_minus);
-
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-            { fq2_push_not_montgomery(t.x) }
-            { fq2_push_not_montgomery(t.y) }
-            { hinted_check_line.clone() }
-            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_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
-        };
-        run(script);
-    }
-
-    #[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_not_montgomery(t.x) }
-            { fq2_push_not_montgomery(t.y) }
-            { fq2_push_not_montgomery(q.x) }
-            { fq2_push_not_montgomery(q.y) }
-            { hinted_check_line.clone() }
-            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
-        );
-    }
-}
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 7ee5f4e79..000000000
--- a/src/bridge/client/chain/chain.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::borrow::Borrow;
-
-use bitcoin::{Amount, OutPoint, PubkeyHash, PublicKey};
-use serde::{Deserialize, Serialize};
-
-use super::{
-    base::ChainAdaptor,
-    ethereum::{EthereumAdaptor, EthereumInitConfig},
-};
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, 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,
-    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,
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug)]
-pub struct PegInEvent {
-    pub depositor: String,
-    pub amount: Amount,
-    pub depositor_pubkey: PublicKey,
-}
-
-static CLIENT_MISSING_CHAIN_DRIVER_ERROR: &str = "Bridge client is missing chain adaptor";
-
-pub struct Chain {
-    ethereum: Option<EthereumAdaptor>,
-    default: Option<Box<dyn ChainAdaptor>>,
-}
-
-impl Default for Chain {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Chain {
-    pub fn new() -> Self {
-        Self {
-            ethereum: EthereumAdaptor::new(),
-            default: None,
-        }
-    }
-
-    pub fn init_default(&mut self, adaptor: Box<dyn ChainAdaptor>) { self.default = Some(adaptor); }
-
-    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.default.is_some() {
-            Ok((*self.default.as_ref().unwrap()).borrow())
-        } else if self.ethereum.is_some() {
-            return Ok(self.ethereum.as_ref().unwrap());
-        } else {
-            Err(CLIENT_MISSING_CHAIN_DRIVER_ERROR)
-        }
-    }
-}
diff --git a/src/bridge/client/cli/client_command.rs b/src/bridge/client/cli/client_command.rs
deleted file mode 100644
index 4d34061c3..000000000
--- a/src/bridge/client/cli/client_command.rs
+++ /dev/null
@@ -1,301 +0,0 @@
-use super::key_command::KeysCommand;
-use crate::bridge::client::client::BitVMClient;
-use crate::bridge::constants::DestinationNetwork;
-use crate::bridge::contexts::base::generate_keys_from_secret;
-use crate::bridge::graphs::base::{VERIFIER_0_SECRET, VERIFIER_1_SECRET};
-use crate::bridge::transactions::base::Input;
-use bitcoin::PublicKey;
-use bitcoin::{Network, OutPoint};
-use clap::{arg, ArgMatches, Command};
-use colored::Colorize;
-use tokio::time::sleep;
-use std::io::{self, Write};
-use std::str::FromStr;
-use std::time::Duration;
-use tokio::io::{AsyncBufReadExt, BufReader};
-
-pub struct CommonArgs {
-    pub key_dir: Option<String>,
-    pub verifiers: Option<Vec<PublicKey>>,
-    pub environment: Option<String>,
-}
-
-
-pub struct ClientCommand {
-    client: BitVMClient,
-}
-
-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),
-            _ => {
-                eprintln!("Invalid environment. Use mainnet, testnet.");
-                std::process::exit(1);
-            }
-        };
-
-        let keys_command = KeysCommand::new(common_args.key_dir);
-        let config = keys_command.read_config().expect("Failed to read config");
-
-        let n_of_n_public_keys = common_args.verifiers.unwrap_or_else(|| {
-            let (_, _, verifier_0_public_key) =
-                generate_keys_from_secret(Network::Bitcoin, VERIFIER_0_SECRET);
-            let (_, _, verifier_1_public_key) =
-                generate_keys_from_secret(Network::Bitcoin, VERIFIER_1_SECRET);
-            vec![verifier_0_public_key, verifier_1_public_key]
-        });
-
-        let bitvm_client = BitVMClient::new(
-            source_network,
-            destination_network,
-            &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(),
-            None,
-        )
-        .await;
-
-        Self {
-            client: bitvm_client,
-        }
-    }
-
-    pub fn get_depositor_address_command() -> Command {
-        Command::new("get-depositor-address")
-            .short_flag('d')
-            .about("Get an address spendable by the registered depositor key")
-            .after_help("Get an address spendable by the registered depositor key")
-    }
-
-    pub async fn handle_get_depositor_address(&mut self) -> io::Result<()> {
-        let address = self.client.get_depositor_address().to_string();
-        println!("{address}");
-        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<()> {
-        for utxo in self.client.get_depositor_utxos().await {
-            println!("{}:{} {}", utxo.txid, utxo.vout, utxo.value);
-        }
-        Ok(())
-    }
-
-    pub fn get_initiate_peg_in_command() -> Command {
-        Command::new("initiate-peg-in")
-        .short_flag('p')
-        .about("Initiate a peg-in")
-        .after_help("Initiate a peg-in by creating a peg-in graph")
-        .arg(arg!(-u --utxo <UTXO> "Specify the uxo 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<()> {
-        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.unwrap();
-        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 with ID {peg_in_id}. Broadcasting deposit...");
-
-        let txid = self.client.broadcast_peg_in_deposit(&peg_in_id).await;
-
-        println!("Broadcasted peg-in deposit with txid {txid}");
-
-        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.get_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.get_data() != &old_data {
-                self.client.flush().await;
-            } else {
-                sleep(Duration::from_millis(250)).await;
-            }
-        }
-    }
-
-    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))
-                    .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").about("Broadcast assert"))
-                    .subcommand(Command::new("take_1").about("Broadcast take 1"))
-                    .subcommand(Command::new("take_2").about("Broadcast take 2"))
-                    .subcommand_required(true)
-            )
-            .subcommand_required(true)
-    }
-
-    pub async fn handle_broadcast_command(&mut self, sub_matches: &ArgMatches) -> io::Result<()> {
-        let subcommand = sub_matches.subcommand();
-        let graph_id = subcommand.unwrap().1.get_one::<String>("graph_id").unwrap();
-
-        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_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", _)) => self.client.broadcast_assert(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,
-            _ => unreachable!(),
-        };
-
-        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-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 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/src/bridge/client/cli/key_command.rs b/src/bridge/client/cli/key_command.rs
deleted file mode 100644
index 0a156d69f..000000000
--- a/src/bridge/client/cli/key_command.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use bitcoin::{Network, PublicKey};
-use clap::{arg, ArgGroup, ArgMatches, Command};
-use serde::{Deserialize, Serialize};
-use std::env;
-use std::fs::{self, OpenOptions};
-use std::io::{self, Read, Write};
-use std::path::PathBuf;
-use toml;
-
-use crate::bridge::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 struct KeysCommand {
-    pub config_path: PathBuf,
-}
-
-impl KeysCommand {
-    pub fn new(key_dir: Option<String>) -> Self {
-        let bitvm_dir = key_dir.map(PathBuf::from).unwrap_or_else(|| {
-            let home_dir = env::var("HOME").expect("Could not find home directory");
-            PathBuf::from(&home_dir).join(".bitvm")
-        });
-
-        let config_path = bitvm_dir.join("bitvm-cli-env.toml");
-
-        // Create .bitvm directory if it doesn't exist
-        if !bitvm_dir.exists() {
-            fs::create_dir_all(&bitvm_dir).expect("Failed to create .bitvm directory");
-        }
-
-        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 default key for that context will be used.")
-            .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))
-            .group(ArgGroup::new("context")
-                .args(["depositor", "operator", "verifier", "withdrawer"])
-                .required(true))
-    }
-
-    pub fn handle_command(&self, sub_matches: &ArgMatches) -> io::Result<()> {
-        let mut config = self.read_config()?;
-
-        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 {
-                println!("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 {
-                println!("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 {
-                println!("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.");
-                std::process::exit(1);
-            }
-        } else {
-            eprintln!("Invalid command. Use --help to see the valid commands.");
-            std::process::exit(1);
-        }
-
-        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())
-    }
-}
-fn pubkey_of(private_key: &str) -> PublicKey {
-    generate_keys_from_secret(Network::Bitcoin, private_key).2
-}
diff --git a/src/bridge/client/client.rs b/src/bridge/client/client.rs
deleted file mode 100644
index 810d14a6e..000000000
--- a/src/bridge/client/client.rs
+++ /dev/null
@@ -1,1708 +0,0 @@
-use futures::future::join_all;
-use musig2::SecNonce;
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use std::{
-    collections::HashMap,
-    fs::{self},
-    path::Path,
-};
-
-use bitcoin::{
-    absolute::Height, consensus::encode::serialize_hex, Address, Amount, Network, OutPoint,
-    PublicKey, ScriptBuf, Txid, XOnlyPublicKey,
-};
-use esplora_client::{AsyncClient, Builder, TxStatus, Utxo};
-
-use crate::bridge::{
-    constants::DestinationNetwork, contexts::base::generate_n_of_n_public_key, graphs::{
-        base::get_tx_statuses,
-        peg_in::{PegInDepositorStatus, PegInVerifierStatus},
-        peg_out::{CommitmentMessageId, PegOutOperatorStatus},
-    }, scripts::generate_pay_to_pubkey_script_address, transactions::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},
-        },
-        serialization::{serialize, try_deserialize},
-        transactions::{
-            base::{Input, InputWithScript},
-            pre_signed::PreSignedTransaction,
-        },
-    },
-    chain::chain::Chain,
-    data_store::data_store::DataStore,
-    sdk::{
-        query::{ClientCliQuery, GraphCliQuery},
-        query_contexts::depositor_signatures::DepositorSignatures,
-    },
-};
-
-const ESPLORA_URL: &str = "https://mutinynet.com/api";
-const TEN_MINUTES: u64 = 10 * 60;
-
-const PRIVATE_DATA_FILE_NAME: &str = "secret_data.json";
-
-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>,
-}
-
-#[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
-    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,
-
-    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,
-    pub file_path_prefix: String,
-
-    private_data: BitVMClientPrivateData,
-
-    chain_adaptor: Chain,
-}
-
-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>,
-        file_path_prefix: 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_prefix = file_path_prefix.unwrap_or("").to_string();
-        let file_path =
-            format! {"bridge_data/{source_network}/{destination_network}/{n_of_n_public_key}"};
-        let full_path = format! {"{file_path_prefix}{file_path}"};
-        Self::create_directories_if_non_existent(&full_path);
-
-        let data = BitVMClientPublicData {
-            version: 1,
-            peg_in_graphs: vec![],
-            peg_out_graphs: vec![],
-        };
-
-        let data_store = DataStore::new().await;
-
-        let private_data = Self::get_private_data(&file_path);
-
-        let chain_adaptor = Chain::new();
-
-        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,
-            file_path_prefix,
-
-            private_data,
-
-            chain_adaptor,
-        }
-    }
-
-    pub fn get_data(&self) -> &BitVMClientPublicData { &self.data}
-
-    pub async fn sync(&mut self) { self.read().await; }
-
-    pub async fn sync_l2(&mut self) { self.read_from_l2().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!("Error: {}", latest_file_names_result.unwrap_err());
-        }
-    }
-
-    pub fn set_chain_adaptor(&mut self, chain_adaptor: Chain) {
-        self.chain_adaptor = chain_adaptor;
-    }
-
-    async fn read_from_l2(&mut self) {
-        let peg_out_result = self.chain_adaptor.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() {
-                    let _ = peg_out_graph.match_and_set_peg_out_event(&mut events).await;
-                }
-            }
-        } 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.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());
-
-            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_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;
-
-        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_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);
-                    }
-                }
-            }
-        }
-
-        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
-            }
-        }
-
-        (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: 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!("Graph id: {} status: {}\n", peg_out_graph.id(), status);
-            }
-        }
-    }
-
-    pub async fn process_peg_in_as_depositor(&mut self, peg_in_graph: &PegInGraph) {
-        if let Some(_) = self.depositor_context {
-            let status = peg_in_graph.depositor_status(&self.esplora).await;
-
-            match status {
-                PegInDepositorStatus::PegInDepositWait => {
-                    self.broadcast_peg_in_deposit(peg_in_graph.id()).await;
-                }
-                PegInDepositorStatus::PegInConfirmWait => {
-                    self.broadcast_peg_in_confirm(peg_in_graph.id()).await;
-                }
-                _ => {
-                    println!(
-                        "Peg-in graph {} is in status: {}",
-                        peg_in_graph.id(),
-                        status
-                    );
-                }
-            }
-        }
-    }
-
-    pub async fn process_peg_in_as_verifier(&mut self, peg_in_graph: &PegInGraph) {
-        if let Some(ref context) = self.verifier_context {
-            let status = peg_in_graph
-                .verifier_status(&self.esplora, Some(context))
-                .await;
-
-            match status {
-                PegInVerifierStatus::PendingOurNonces => {
-                    println!("Pushing nonce");
-                    self.push_peg_in_nonces(peg_in_graph.id());
-                }
-                PegInVerifierStatus::PendingOurSignature => {
-                    println!("Pushing signature");
-                    self.pre_sign_peg_in(peg_in_graph.id());
-                }
-                PegInVerifierStatus::ReadyToSubmit => {
-                    println!("Broadcasting peg-in confirm");
-                    self.broadcast_peg_in_confirm(peg_in_graph.id()).await;
-                }
-                _ => {
-                    // nothing to do
-                }
-            }
-        }
-    }
-
-    pub async fn process_peg_ins(&mut self) {
-        let peg_in_graphs = self.get_data().peg_in_graphs.clone();
-
-        for peg_in_graph in peg_in_graphs {
-            self.process_peg_in_as_depositor(&peg_in_graph).await;
-            self.process_peg_in_as_verifier(&peg_in_graph).await;
-        }
-    }
-
-    pub async fn process_peg_outs(&mut self) {
-        let peg_out_graphs = self.get_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 => {
-                    self.broadcast_start_time(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutPegOutConfirmAvailable => {
-                    self.broadcast_peg_out_confirm(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutKickOff1Available => {
-                    self.broadcast_kick_off_1(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutKickOff2Available => {
-                    self.broadcast_kick_off_2(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutAssertAvailable => {
-                    self.broadcast_assert(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutTake1Available => {
-                    self.broadcast_take_1(peg_out_graph.id()).await
-                }
-                PegOutOperatorStatus::PegOutTake2Available => {
-                    self.broadcast_take_2(peg_out_graph.id()).await
-                }
-                _ => {
-                    println!(
-                        "Peg-out graph {} is in status: {}",
-                        peg_out_graph.id(),
-                        status
-                    );
-                }
-            }
-        }
-    }
-
-    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 status = peg_in_graph.verifier_status(&self.esplora, self.verifier_context.as_ref()).await;
-            println!("Graph id: {} status: {}\n", peg_in_graph.id(), status);
-        }
-
-        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) -> Txid {
-        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) -> Txid {
-        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) -> Txid {
-        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, commitment_secrets) = PegOutGraph::new(
-            self.operator_context.as_ref().unwrap(),
-            peg_in_graph.unwrap(),
-            kickoff_input,
-        );
-
-        self.private_data.commitment_secrets = HashMap::from([(
-            *operator_public_key,
-            HashMap::from([(peg_out_graph_id.to_string(), commitment_secrets)]),
-        )]);
-        Self::save_local_private_file(&self.file_path, &serialize(&self.private_data));
-
-        self.data.peg_out_graphs.push(peg_out_graph);
-
-        peg_out_graph_id
-    }
-
-    pub async fn broadcast_peg_out(&mut self, peg_out_graph_id: &str, input: Input) {
-        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.operator_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .peg_out(
-                    &self.esplora,
-                    self.operator_context.as_ref().unwrap(),
-                    input,
-                )
-                .await;
-        }
-    }
-
-    pub async fn broadcast_peg_out_confirm(&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().peg_out_confirm(&self.esplora).await;
-    }
-
-    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");
-        }
-
-        if self.operator_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .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;
-        }
-    }
-
-    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");
-        }
-
-        if self.operator_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .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;
-        }
-    }
-
-    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,
-                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;
-    }
-
-    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 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!("No depositor key set");
-        }
-    }
-    
-    pub async fn get_depositor_utxos(&self) -> Vec<Utxo> {
-        self.esplora
-            .get_address_utxo(self.get_depositor_address())
-            .await
-            .unwrap()
-    }
-
-    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(),
-                    commitment_secrets: 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_DATA_FILE_NAME}"),
-            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_DATA_FILE_NAME}")) {
-            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;
-    //         }
-    //     }
-    // }
-}
-
-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 self.data.peg_out_graphs.iter().any(|peg_out| peg_out.peg_in_graph_id == *peg_in.id()) {
-                    true => None,
-                    false => match peg_in.depositor_status(&self.esplora).await {
-                        PegInDepositorStatus::PegInConfirmComplete => Some(json!({
-                            "graph_id": peg_in.id(),
-                            "amount": peg_in.peg_in_deposit_transaction.prev_outs()[0].value.to_sat(),
-                            "source_outpoint": {
-                                "txid": peg_in.peg_in_deposit_transaction.tx().compute_txid(),
-                                "vout": 0
-                            },
-                        })),
-                        _ => None,
-                    },
-                }
-            })
-        }))
-        .await
-        .iter()
-        .map(|v| v.clone().unwrap())
-        .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.unwrap();
-                    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(),
-                        "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, peg_out_amount) =
-                        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),
-                                    tx.tx().output[0].value.to_sat(),
-                                )
-                            }
-                            None => (Some(json!([])), None, 0),
-                        };
-
-                    let status = graph.interpret_operator_status(tx_status_result.as_ref());
-                    json!({
-                        "type": "peg_out",
-                        "graph_id": graph.id(),
-                        "status": status.to_string(),
-                        "amount": peg_out_amount,
-                        "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/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/mod.rs b/src/bridge/client/mod.rs
deleted file mode 100644
index 11b88ca16..000000000
--- a/src/bridge/client/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod chain;
-pub mod cli;
-pub mod client;
-pub mod data_store;
-pub mod sdk;
diff --git a/src/bridge/connectors/connector_b.rs b/src/bridge/connectors/connector_b.rs
deleted file mode 100644
index 11633a37e..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,
-    },
-    base::*,
-};
-
-#[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,
-            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 0684f9094..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, base::*};
-
-// 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,
-            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/contexts/verifier.rs b/src/bridge/contexts/verifier.rs
deleted file mode 100644
index 46bcc297c..000000000
--- a/src/bridge/contexts/verifier.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::All,
-    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,
-
-    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 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);
-        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_key,
-            n_of_n_taproot_public_key,
-        }
-    }
-}
diff --git a/src/bridge/graphs/base.rs b/src/bridge/graphs/base.rs
deleted file mode 100644
index f984397cd..000000000
--- a/src/bridge/graphs/base.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use bitcoin::{Network, Transaction, Txid};
-use esplora_client::{AsyncClient, Error, TxStatus};
-use futures::future::join_all;
-
-pub const GRAPH_VERSION: &str = "0.1";
-
-pub const INITIAL_AMOUNT: u64 = 2 << 16; // 131072
-pub const FEE_AMOUNT: u64 = 10_000;
-// TODO: Either repalce this with a routine that calculates 'min relay fee' for
-// every tx, or define local constants with appropriate values in every tx file
-// (see MIN_RELAY_FEE_AMOUNT in kick_off_2.rs).
-pub const MESSAGE_COMMITMENT_FEE_AMOUNT: u64 = 27_182;
-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) {
-    if is_confirmed(client, txid).await {
-        panic!("Transaction already mined!");
-    }
-}
-
-pub async fn is_confirmed(client: &AsyncClient, txid: Txid) -> bool {
-    let tx_status = client.get_tx_status(&txid).await;
-    tx_status
-        .map(|x| x.confirmed)
-        .unwrap_or_else(|err| panic!("Failed to get transaction status, error occurred {err:?}"))
-}
-
-pub async fn broadcast_and_verify(
-    client: &AsyncClient,
-    transaction: &Transaction,
-) {
-    let txid = transaction.txid();
-
-    if let Ok(Some(_)) = client.get_tx(&txid).await {
-        println!("Tx already submitted.");
-        return;
-    }
-
-    let tx_result = client.broadcast(transaction).await;
-
-    if tx_result.is_ok() || is_confirmed(client, txid).await {
-        println!("Tx mined successfully.");
-    } else {
-        panic!("Error occurred {:?}", tx_result);
-    }
-}
-
-pub async fn get_tx_statuses(
-    client: &AsyncClient,
-    txids: &Vec<Txid>,
-) -> Vec<Result<TxStatus, Error>> {
-    join_all(txids.iter().map(|txid| client.get_tx_status(txid))).await
-}
diff --git a/src/bridge/graphs/peg_out.rs b/src/bridge/graphs/peg_out.rs
deleted file mode 100644
index 4b664308b..000000000
--- a/src/bridge/graphs/peg_out.rs
+++ /dev/null
@@ -1,2034 +0,0 @@
-use bitcoin::{
-    hashes::Hash,
-    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 crate::bridge::{
-    constants::{
-        DESTINATION_NETWORK_TXID_LENGTH, SOURCE_NETWORK_TXID_LENGTH, START_TIME_MESSAGE_LENGTH,
-    },
-    superblock::{
-        find_superblock, get_start_time_block_number, get_superblock_hash_message,
-        get_superblock_message, SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH,
-    },
-    transactions::signing_winternitz::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::{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,
-            peg_out_confirm::PegOutConfirmTransaction,
-            pre_signed::PreSignedTransaction,
-            signing_winternitz::{WinternitzPublicKey, WinternitzSecret},
-            start_time::StartTimeTransaction,
-            start_time_timeout::StartTimeTimeoutTransaction,
-            take_1::Take1Transaction,
-            take_2::Take2Transaction,
-        },
-    },
-    base::{broadcast_and_verify, get_block_height, verify_if_not_mined, BaseGraph, GRAPH_VERSION},
-    peg_in::PegInGraph,
-};
-
-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 {
-    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
-    PegOutPegOutConfirmAvailable,
-    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. 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::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?"
-            ),
-        }
-    }
-}
-
-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,
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
-pub enum CommitmentMessageId {
-    PegOutTxIdSourceNetwork,
-    PegOutTxIdDestinationNetwork,
-    StartTime,
-    Superblock,
-    SuperblockHash,
-}
-
-impl CommitmentMessageId {
-    pub fn generate_commitment_secrets() -> HashMap<CommitmentMessageId, WinternitzSecret> {
-        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),
-            ),
-        ])
-    }
-}
-
-#[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,
-
-    peg_out_confirm_transaction: PegOutConfirmTransaction,
-    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,
-
-    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 }
-}
-
-impl PegOutGraph {
-    pub fn new(
-        context: &OperatorContext,
-        peg_in_graph: &PegInGraph,
-        peg_out_confirm_input: Input,
-    ) -> (Self, HashMap<CommitmentMessageId, WinternitzSecret>) {
-        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 commitment_secrets = CommitmentMessageId::generate_commitment_secrets();
-        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 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,
-        );
-
-        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,
-            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(1.0).unwrap(); // TODO replace placeholder
-        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,
-            },
-        );
-
-        let assert_vout_0 = 1;
-        let assert_transaction = AssertTransaction::new(
-            &connectors.connector_4,
-            &connectors.connector_5,
-            &connectors.connector_b,
-            &connectors.connector_c,
-            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,
-            &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_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,
-            &connectors.connector_5,
-            &connectors.connector_c,
-            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(
-            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,
-                peg_out_confirm_transaction,
-                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,
-                peg_out_chain_event: None,
-                peg_out_transaction: None,
-            },
-            commitment_secrets,
-        )
-    }
-
-    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,
-        );
-
-        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,
-            &self.n_of_n_taproot_public_key,
-            &connectors.connector_1,
-            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(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.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,
-            },
-        );
-
-        let assert_vout_0 = 1;
-        let assert_transaction = AssertTransaction::new_for_validation(
-            &connectors.connector_4,
-            &connectors.connector_5,
-            &connectors.connector_b,
-            &connectors.connector_c,
-            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,
-            &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_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.connector_5,
-            &self.connector_c,
-            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.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,
-            peg_out_confirm_transaction,
-            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,
-            peg_out_chain_event: 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,
-            &self.connector_b,
-            &secret_nonces[&self.assert_transaction.tx().compute_txid()],
-        );
-        self.disprove_chain_transaction.pre_sign(
-            context,
-            &self.connector_b,
-            &secret_nonces[&self.disprove_chain_transaction.tx().compute_txid()],
-        );
-        self.disprove_transaction.pre_sign(
-            context,
-            &self.connector_5,
-            &secret_nonces[&self.disprove_transaction.tx().compute_txid()],
-        );
-        self.kick_off_timeout_transaction.pre_sign(
-            context,
-            &self.connector_1,
-            &secret_nonces[&self.kick_off_timeout_transaction.tx().compute_txid()],
-        );
-        self.start_time_timeout_transaction.pre_sign(
-            context,
-            &self.connector_1,
-            &self.connector_2,
-            &secret_nonces[&self.start_time_timeout_transaction.tx().compute_txid()],
-        );
-        self.take_1_transaction.pre_sign(
-            context,
-            &self.connector_0,
-            &self.connector_b,
-            &secret_nonces[&self.take_1_transaction.tx().compute_txid()],
-        );
-        self.take_2_transaction.pre_sign(
-            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
-    }
-
-    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)
-                {
-                    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.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| {
-                        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 {
-            PegOutVerifierStatus::PegOutPresign
-        }
-    }
-
-    pub async fn operator_status(&self, client: &AsyncClient) -> PegOutOperatorStatus {
-        if self.n_of_n_presigned && self.is_peg_out_initiated() {
-            let (
-                assert_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 = 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.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| {
-                                block_height + self.connector_b.num_blocks_timelock_1
-                                    <= 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.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| {
-                                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_operator_status(
-        &self,
-        peg_out_status: Option<&Result<TxStatus, Error>>,
-    ) -> PegOutWithdrawerStatus {
-        if peg_out_status.is_some() {
-            if peg_out_status
-                .unwrap()
-                .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_operator_status(peg_out_status.as_ref())
-    }
-
-    pub async fn peg_out(&mut self, client: &AsyncClient, context: &OperatorContext, input: Input) {
-        if !self.is_peg_out_initiated() {
-            panic!("Peg out not initiated on L2 chain");
-        }
-
-        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);
-        }
-
-        let peg_out_tx = self.peg_out_transaction.as_ref().unwrap().finalize();
-
-        broadcast_and_verify(client, &peg_out_tx).await;
-    }
-
-    pub async fn peg_out_confirm(&mut self, client: &AsyncClient) {
-        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;
-
-            if peg_out_status.is_ok_and(|status| status.confirmed) {
-                // complete peg-out-confirm tx
-                let peg_out_confirm_tx = self.peg_out_confirm_transaction.finalize();
-
-                // broadcast peg-out-confirm tx
-                broadcast_and_verify(client, &peg_out_confirm_tx).await;
-            } else {
-                panic!("Peg-out tx has not been confirmed!");
-            }
-        } else {
-            panic!("Peg-out tx has not been created!");
-        }
-    }
-
-    pub async fn kick_off_1(
-        &mut self,
-        client: &AsyncClient,
-        context: &OperatorContext,
-        source_network_txid_commitment_secret: &WinternitzSecret,
-        destination_network_txid_commitment_secret: &WinternitzSecret,
-    ) {
-        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;
-
-        if peg_out_confirm_status.is_ok_and(|status| status.confirmed) {
-            // complete kick-off 1 tx
-            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,
-            );
-            let kick_off_1_tx = self.kick_off_1_transaction.finalize();
-
-            // broadcast kick-off 1 tx
-            broadcast_and_verify(client, &kick_off_1_tx).await;
-        } else {
-            panic!("Peg-out-confirm tx has not been confirmed!");
-        }
-    }
-
-    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
-            broadcast_and_verify(client, &challenge_tx).await;
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn start_time(
-        &mut self,
-        client: &AsyncClient,
-        context: &OperatorContext,
-        start_time_commitment_secret: &WinternitzSecret,
-    ) {
-        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) {
-            // sign start time tx
-            self.start_time_transaction.sign(
-                context,
-                &self.connector_2,
-                get_start_time_block_number(),
-                start_time_commitment_secret,
-            );
-
-            // complete start time tx
-            let start_time_tx = self.start_time_transaction.finalize();
-
-            // broadcast start time tx
-            broadcast_and_verify(client, &start_time_tx).await;
-        } 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.connector_1.num_blocks_timelock_leaf_2 <= 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
-                broadcast_and_verify(client, &start_time_timeout_tx).await;
-            } 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,
-        context: &OperatorContext,
-        superblock_commitment_secret: &WinternitzSecret,
-        superblock_hash_commitment_secret: &WinternitzSecret,
-    ) {
-        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.connector_1.num_blocks_timelock_leaf_0 <= blockchain_height
-                })
-            {
-                // complete kick-off 2 tx
-                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,
-                    },
-                );
-                let kick_off_2_tx = self.kick_off_2_transaction.finalize();
-
-                // broadcast kick-off 2 tx
-                broadcast_and_verify(client, &kick_off_2_tx).await;
-            } 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.connector_1.num_blocks_timelock_leaf_1 <= 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);
-                broadcast_and_verify(client, &kick_off_timeout_tx).await;
-            } 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.connector_b.num_blocks_timelock_1 <= blockchain_height
-                })
-            {
-                // complete assert tx
-                let assert_tx = self.assert_transaction.finalize();
-
-                // broadcast assert tx
-                broadcast_and_verify(client, &assert_tx).await;
-            } 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(
-                &self.connector_c,
-                input_script_index,
-                output_script_pubkey,
-            );
-            let disprove_tx = self.disprove_transaction.finalize();
-
-            // broadcast disprove tx
-            broadcast_and_verify(client, &disprove_tx).await;
-        } 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
-            broadcast_and_verify(client, &disprove_chain_tx).await;
-        } 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.connector_3.num_blocks_timelock <= blockchain_height
-                })
-            {
-                // complete take 1 tx
-                let take_1_tx = self.take_1_transaction.finalize();
-
-                // broadcast take 1 tx
-                broadcast_and_verify(client, &take_1_tx).await;
-            } 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.connector_4.num_blocks_timelock <= blockchain_height
-                })
-            {
-                // complete take 2 tx
-                let take_2_tx = self.take_2_transaction.finalize();
-
-                // broadcast take 2 tx
-                broadcast_and_verify(client, &take_2_tx).await;
-            } else {
-                panic!("Assert tx timelock has not elapsed!");
-            }
-        } else {
-            panic!("Peg-in confirm tx and assert tx have not been confirmed!");
-        }
-    }
-
-    pub fn is_peg_out_initiated(&self) -> bool { self.peg_out_chain_event.is_some()}
-
-    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, Error>,
-        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 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, 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_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_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.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_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);
-    }
-
-    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>,
-    ) -> 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);
-        let connector_c = ConnectorC::new(network, operator_taproot_public_key);
-
-        PegOutConnectors {
-            connector_0,
-            connector_1,
-            connector_2,
-            connector_3,
-            connector_4,
-            connector_5,
-            connector_6,
-            connector_a,
-            connector_b,
-            connector_c,
-        }
-    }
-}
-
-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/serialization.rs b/src/bridge/serialization.rs
deleted file mode 100644
index bed807c7c..000000000
--- a/src/bridge/serialization.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub fn serialize(object: &impl Serialize) -> String { serde_json::to_string(object).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: {}", err)),
-    }
-}
diff --git a/src/bridge/superblock.rs b/src/bridge/superblock.rs
deleted file mode 100644
index dfb169f7d..000000000
--- a/src/bridge/superblock.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::mem::size_of;
-
-use bitcoin::{block::Header, consensus::encode::serialize, hashes::Hash, BlockHash};
-
-/*
-  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() -> u32 { 860033}
-
-pub fn find_superblock() -> Header { todo!() }
-
-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>();
diff --git a/src/bridge/transactions/base.rs b/src/bridge/transactions/base.rs
deleted file mode 100644
index 47c90b11f..000000000
--- a/src/bridge/transactions/base.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-use bitcoin::{Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey};
-use core::cmp;
-use musig2::{secp256k1::schnorr::Signature, PubNonce};
-use std::collections::HashMap;
-
-use super::{
-    pre_signed::PreSignedTransaction,
-    pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction},
-};
-
-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 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 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();
-    nonces.extend(source_transaction.musig2_nonces().clone());
-
-    let nonce_signatures = destination_transaction.musig2_nonce_signatures_mut();
-    nonce_signatures.extend(source_transaction.musig2_nonce_signatures().clone());
-
-    let signatures = destination_transaction.musig2_signatures_mut();
-    signatures.extend(source_transaction.musig2_signatures().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 PreSignedTransaction + 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, Secp256k1,
-        },
-        PublicKey, Txid,
-    };
-    use musig2::{secp256k1::schnorr::Signature, PubNonce};
-
-    use crate::bridge::{
-        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 = Secp256k1::new().sign_schnorr(
-                    &get_nonce_message(&secret_nonce.public_nonce()),
-                    &keypairs[signer],
-                );
-                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/src/bridge/transactions/signing_winternitz.rs b/src/bridge/transactions/signing_winternitz.rs
deleted file mode 100644
index 7b193f995..000000000
--- a/src/bridge/transactions/signing_winternitz.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use bitcoin::Witness;
-use serde::{Deserialize, Serialize};
-
-use crate::signatures::{
-    winternitz::{
-        generate_public_key, Parameters, PublicKey, SecretKey,
-    },
-    winternitz_hash::{sign_hash, WINTERNITZ_MESSAGE_VERIFIER},
-};
-use crate::treepp::{Script, script};
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
-pub struct WinternitzSecret {
-    secret_key: SecretKey,
-    parameters: Parameters,
-}
-
-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);
-
-        // TODO: Figure out the best parameters
-        //let parameters = Parameters::new((BLAKE3_HASH_LENGTH * 2) as u32, 4);
-        let parameters = Parameters::new((message_size * 2) as u32, 4);
-        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_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::{WinternitzPublicKey, WinternitzSecret};
-    use crate::{chunker::common::BLAKE3_HASH_LENGTH, signatures::winternitz::generate_public_key};
-
-    #[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_digit_count() {
-            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_digit_count() as usize
-        );
-        for i in 0..public_key.parameters.total_digit_count() {
-            assert_eq!(
-                public_key.public_key[i as usize].len(),
-                20,
-                "public_key[{}]: {:?}",
-                i,
-                public_key.public_key[i as usize]
-            );
-        }
-    }
-}
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/chunker/assigner.rs b/src/chunker/assigner.rs
deleted file mode 100644
index b5dbd2ed4..000000000
--- a/src/chunker/assigner.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use super::{common::*, elements::ElementTrait};
-use crate::treepp::*;
-use std::{collections::BTreeMap, rc::Rc};
-
-/// Implement `BCAssinger` to adapt with bridge.
-pub trait BCAssigner: Default {
-    /// check hash
-    fn create_hash(&mut self, id: &str);
-    /// return a element of
-    fn locking_script<T: ElementTrait + ?Sized>(&self, element: &Box<T>) -> Script;
-    fn get_witness<T: ElementTrait + ?Sized>(&self, element: &Box<T>) -> RawWitness;
-    /// output sciprt for all elements, used by assert transaction
-    fn all_intermediate_scripts(&self) -> Vec<Vec<Script>>;
-    /// output witness for all elements, used by assert transaction
-    fn all_intermediate_witnesses(
-        &self,
-        elements: BTreeMap<String, Rc<Box<dyn ElementTrait>>>,
-    ) -> Vec<Vec<RawWitness>>;
-    /// recover hashes from witnesses
-    fn recover_from_witness(
-        &mut self,
-        witnesses: Vec<Vec<RawWitness>>,
-    ) -> BTreeMap<String, BLAKE3HASH>;
-}
-
-#[derive(Default)]
-pub struct DummyAssinger {
-    bc_map: BTreeMap<String, String>,
-}
-
-impl BCAssigner for DummyAssinger {
-    fn create_hash(&mut self, id: &str) {
-        if self.bc_map.contains_key(id) {
-            panic!("varible name is repeated, check {}", id);
-        }
-        self.bc_map.insert(id.to_string(), id.to_string());
-    }
-
-    fn locking_script<T: ElementTrait + ?Sized>(&self, _: &Box<T>) -> Script {
-        script! {}
-    }
-
-    fn get_witness<T: ElementTrait + ?Sized>(&self, element: &Box<T>) -> RawWitness {
-        element.to_hash_witness().unwrap()
-    }
-
-    fn recover_from_witness(
-        &mut self,
-        witnesses: Vec<Vec<RawWitness>>,
-    ) -> BTreeMap<String, BLAKE3HASH> {
-        let mut btree_map: BTreeMap<String, BLAKE3HASH> = Default::default();
-        // flat the witnesses and recover to btreemap
-        let flat_witnesses: Vec<RawWitness> = witnesses.into_iter().fold(vec![], |mut w, x| {
-            w.extend(x);
-            w
-        });
-        assert_eq!(flat_witnesses.len(), self.bc_map.len());
-        for ((id, _), idx) in self.bc_map.iter().zip(0..flat_witnesses.len()) {
-            btree_map.insert(id.to_owned(), witness_to_array(flat_witnesses[idx].clone()));
-        }
-        btree_map
-    }
-
-    fn all_intermediate_scripts(&self) -> Vec<Vec<Script>> {
-        vec![self.bc_map.iter().map(|(_, _)| script! {}).collect()]
-    }
-
-    fn all_intermediate_witnesses(
-        &self,
-        elements: BTreeMap<String, Rc<Box<dyn ElementTrait>>>,
-    ) -> Vec<Vec<RawWitness>> {
-        for (key, _) in self.bc_map.iter() {
-            if !elements.contains_key(key) {
-                println!("unconsistent key: {}", key)
-            }
-        }
-        assert_eq!(elements.len(), self.bc_map.len());
-        vec![elements
-            .iter()
-            .map(|(_, element)| self.get_witness(element))
-            .collect()]
-    }
-}
diff --git a/src/chunker/chunk_accumulator.rs b/src/chunker/chunk_accumulator.rs
deleted file mode 100644
index 608ea57e3..000000000
--- a/src/chunker/chunk_accumulator.rs
+++ /dev/null
@@ -1,447 +0,0 @@
-#![allow(non_snake_case)]
-use super::assigner::BCAssigner;
-use super::chunk_evaluate_line::*;
-use super::chunk_fq12_multiplication::*;
-use super::elements::DataType::Fq12Data;
-use super::elements::*;
-use super::elements::Fq12Type;
-use super::segment::*;
-
-use crate::bn254::ell_coeffs::EllCoeff;
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::bn254::fq12::Fq12;
-use crate::bn254::utils::*;
-use crate::treepp::*;
-
-use ark_ec::bn::BnConfig;
-use ark_ff::Field;
-
-pub fn chunk_accumulator<T: BCAssigner>(
-    assigner: &mut T,
-    im_var_p: Vec<Fq2Type>,
-    constants: Vec<G2Prepared>,
-    c: ark_bn254::Fq12,
-    c_inv: ark_bn254::Fq12,
-    wi: ark_bn254::Fq12,
-    p_lst: Vec<ark_bn254::G1Affine>,
-) -> (Vec<Segment>, Fq12Type, ark_bn254::Fq12) {
-    let mut segments = vec![];
-
-    assert_eq!(constants.len(), 4);
-    let num_line_groups = constants.len();
-
-    let line_coeffs = collect_line_coeffs(constants);
-    let num_lines = line_coeffs.len();
-
-    let mut f = c_inv;
-
-    let mut param_c_inv = Fq12Type::new(assigner, "c_inv_init");
-    param_c_inv.fill_with_data(Fq12Data(c_inv));
-    let mut param_c = Fq12Type::new(assigner, "c_init");
-    param_c.fill_with_data(Fq12Data(c));
-    let mut param_wi = Fq12Type::new(assigner, "wi_init");
-    param_wi.fill_with_data(Fq12Data(wi));
-    let mut param_f = Fq12Type::new(assigner, "f_init");
-    param_f.fill_with_data(Fq12Data(f));
-
-    // ATE_LOOP_COUNT = 65
-    for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-        let fx = f.square();
-        let (hinted_script, hint) = Fq12::hinted_square(f);
-        let (s, r) = make_chunk_square(
-            assigner,
-            format!("F_{}_square", i),
-            param_f,
-            fx,
-            hinted_script.clone(),
-            hint.clone(),
-        );
-        segments.extend(s);
-        param_f = r;
-        f = fx;
-
-        if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 {
-            let fx = f * c_inv;
-            let (s, r) = make_chunk_mul(
-                assigner,
-                format!("F_{}_mul_c_inv", i),
-                param_f,
-                param_c_inv.clone(),
-                f,
-                c_inv,
-            );
-            segments.extend(s);
-            param_f = r;
-            f = fx;
-        } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-            let fx = f * c;
-            let (s, r) = make_chunk_mul(
-                assigner,
-                format!("F_{}_mul_c", i),
-                param_f,
-                param_c.clone(),
-                f,
-                c,
-            );
-            segments.extend(s);
-            param_f = r;
-            f = fx;
-        }
-
-        // num_line_groups = 4
-        for j in 0..num_line_groups {
-            let p = p_lst[j];
-            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 (s, r) = make_chunk_ell(
-                assigner,
-                format!("F_{}_mul_c_1p{}", i, j),
-                param_f,
-                im_var_p[j].clone(),
-                f,
-                -p.x / p.y,
-                p.y.inverse().unwrap(),
-                coeffs,
-            );
-            segments.extend(s);
-            param_f = r;
-            f = fx;
-        }
-
-        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 {
-                let p = p_lst[j];
-                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 (s, r) = make_chunk_ell(
-                    assigner,
-                    format!("F_{}_mul_c_2p{}", i, j),
-                    param_f,
-                    im_var_p[j].clone(),
-                    f,
-                    -p.x / p.y,
-                    p.y.inverse().unwrap(),
-                    coeffs,
-                );
-                segments.extend(s);
-                param_f = r;
-                f = fx;
-            }
-        }
-    }
-
-    let c_inv_p = c_inv.frobenius_map(1);
-    let (hinted_script, hint) = Fq12::hinted_frobenius_map(1, c_inv);
-    let (s, r) = make_chunk_frobenius_map(
-        assigner,
-        "F_with_c_inv_f_m".to_string(),
-        param_c_inv.clone(),
-        c_inv_p,
-        hinted_script.clone(),
-        hint.clone(),
-    );
-    segments.extend(s);
-    let param_c_inv_p = r;
-
-    let fx = f * c_inv_p;
-    let (s, r) = make_chunk_mul(
-        assigner,
-        "F_with_c_inv_mul".to_string(),
-        param_f,
-        param_c_inv_p.clone(),
-        f,
-        c_inv_p,
-    );
-
-    segments.extend(s);
-    param_f = r;
-    f = fx;
-
-    let c_p2 = c.frobenius_map(2);
-    let (hinted_script, hint) = Fq12::hinted_frobenius_map(2, c);
-    let (s, r) = make_chunk_frobenius_map(
-        assigner,
-        "F_with_c_f_m".to_string(),
-        param_c.clone(),
-        c_p2,
-        hinted_script.clone(),
-        hint.clone(),
-    );
-
-    segments.extend(s);
-    let param_c_p2 = r;
-
-    let fx = f * c_p2;
-    let (s, r) = make_chunk_mul(
-        assigner,
-        "F_with_c_mul".to_string(),
-        param_f,
-        param_c_p2.clone(),
-        f,
-        c_p2,
-    );
-
-    segments.extend(s);
-    param_f = r;
-    f = fx;
-
-    let c_inv_p3 = c_inv.frobenius_map(3);
-    let (hinted_script, hint) = Fq12::hinted_frobenius_map(3, c_inv);
-    let (s, r) = make_chunk_frobenius_map(
-        assigner,
-        "F_with_c_inv3_f_m".to_string(),
-        param_c_inv.clone(),
-        c_inv_p3,
-        hinted_script.clone(),
-        hint.clone(),
-    );
-    segments.extend(s);
-    let param_c_inv_p3 = r;
-
-    let fx = f * c_inv_p3;
-    let (s, r) = make_chunk_mul(
-        assigner,
-        "F_with_c_inv3_mul".to_string(),
-        param_f,
-        param_c_inv_p3.clone(),
-        f,
-        c_inv_p3,
-    );
-
-    segments.extend(s);
-    param_f = r;
-    f = fx;
-
-    let fx = f * wi;
-    let (s, r) = make_chunk_mul(
-        assigner,
-        "F_with_wi_mul".to_string(),
-        param_f,
-        param_wi.clone(),
-        f,
-        wi,
-    );
-
-    segments.extend(s);
-    param_f = r;
-    f = fx;
-
-    // num_line_groups = 4
-    for j in 0..num_line_groups {
-        let p = p_lst[j];
-        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 (s, r) = make_chunk_ell(
-            assigner,
-            format!("F_final_1p{}", j),
-            param_f,
-            im_var_p[j].clone(),
-            f,
-            -p.x / p.y,
-            p.y.inverse().unwrap(),
-            coeffs,
-        );
-
-        segments.extend(s);
-        param_f = r;
-        f = fx;
-    }
-
-    for j in 0..num_line_groups {
-        let p = p_lst[j];
-        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 (s, r) = make_chunk_ell(
-            assigner,
-            format!("F_final_2p{}", j),
-            param_f,
-            im_var_p[j].clone(),
-            f,
-            -p.x / p.y,
-            p.y.inverse().unwrap(),
-            coeffs,
-        );
-
-        segments.extend(s);
-        param_f = r;
-        f = fx;
-    }
-
-    // evaluate L3
-    (segments, param_f, f)
-}
-
-pub fn make_chunk_square<T: BCAssigner>(
-    assigner: &mut T,
-    fn_name: String,
-    param_f: Fq12Type,
-    fx: ark_bn254::Fq12,
-    script: Script,
-    hint: Vec<Hint>,
-) -> (Vec<Segment>, Fq12Type) {
-    let mut segments = vec![];
-    let mut c = Fq12Type::new(assigner, &format!("{}_o_a", fn_name));
-    c.fill_with_data(Fq12Data(fx));
-    segments.push(
-        Segment::new_with_name(fn_name, script)
-            .add_parameter(&param_f)
-            .add_result(&c)
-            .add_hint(hint),
-    );
-
-    (segments, c)
-}
-
-pub fn make_chunk_mul<T: BCAssigner>(
-    assigner: &mut T,
-    fn_name: String,
-    param_a: Fq12Type,
-    param_b: Fq12Type,
-    a: ark_bn254::Fq12,
-    b: ark_bn254::Fq12,
-) -> (Vec<Segment>, Fq12Type) {
-    let mut segments = vec![];
-
-    let (segments_mul, c) = fq12_mul_wrapper(assigner, &fn_name, param_a, param_b, a, b);
-    segments.extend(segments_mul);
-
-    (segments, c)
-}
-
-pub fn make_chunk_ell<T: BCAssigner>(
-    assigner: &mut T,
-    fn_name: String,
-    pf: Fq12Type,
-    pxy: Fq2Type,
-    f: ark_bn254::Fq12,
-    x: ark_bn254::Fq,
-    y: ark_bn254::Fq,
-    constant: &EllCoeff,
-) -> (Vec<Segment>, Fq12Type) {
-    let mut segments = vec![];
-
-    let (segments_mul, c) = chunk_evaluate_line(assigner, &fn_name, pf, pxy, f, x, y, constant);
-    segments.extend(segments_mul);
-
-    (segments, c)
-}
-
-pub fn make_chunk_frobenius_map<T: BCAssigner>(
-    assigner: &mut T,
-    fn_name: String,
-    a: Fq12Type,
-    fx: ark_bn254::Fq12,
-    script: Script,
-    hint: Vec<Hint>,
-) -> (Vec<Segment>, Fq12Type) {
-    let mut segments = vec![];
-
-    let mut c = Fq12Type::new(assigner, &format!("{}_o_a", fn_name));
-    c.fill_with_data(Fq12Data(fx));
-    segments.push(
-        Segment::new_with_name(fn_name, script)
-            .add_parameter(&a)
-            .add_result(&c)
-            .add_hint(hint),
-    );
-
-    (segments, c)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::utils::fq12_push_not_montgomery;
-    use crate::chunker::assigner::DummyAssinger;
-    use crate::execute_script_with_inputs;
-
-    use ark_ff::Field;
-    use ark_std::UniformRand;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_make_chunk_square() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let mut max_stack = 0;
-
-        let a = ark_bn254::Fq12::rand(&mut prng);
-        let b = a.square();
-
-        let (hinted_square, hints) = Fq12::hinted_square(a);
-
-        let script = script! {
-            for hint in hints.clone() {
-                { hint.push() }
-            }
-            { fq12_push_not_montgomery(a) }
-            { hinted_square.clone() }
-            { fq12_push_not_montgomery(b) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        // assert!(exec_result.success);
-
-        max_stack = max_stack.max(exec_result.stats.max_nb_stack_items);
-        println!(
-            "Fq12::hinted_square: {} @ {} stack",
-            hinted_square.len(),
-            max_stack
-        );
-
-        println!("chunk:");
-        let mut assigner = DummyAssinger::default();
-        let mut pa = Fq12Type::new(&mut assigner, &format!("i_a"));
-        pa.fill_with_data(Fq12Data(b));
-        let (segments, r) = make_chunk_square(
-            &mut assigner,
-            "test".to_owned(),
-            pa,
-            b,
-            hinted_square.clone(),
-            hints.clone(),
-        );
-        {
-            let script0 = segments[0].script(&mut assigner);
-            let witness0 = segments[0].witness(&mut assigner);
-            // Check the consistency between script and witness
-            println!("witness0 len {}", witness0.len());
-            println!("script0 len {}", script0.len());
-            let res0 = execute_script_with_inputs(script0, witness0);
-            println!("res0: {:}", res0);
-        }
-    }
-}
diff --git a/src/chunker/chunk_evaluate_line.rs b/src/chunker/chunk_evaluate_line.rs
deleted file mode 100644
index 42355d9e1..000000000
--- a/src/chunker/chunk_evaluate_line.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use super::elements::{
-    DataType::Fq12Data, DataType::Fq2Data, DataType::Fq6Data, DataType::FqData, ElementTrait,
-    Fq12Type, Fq2Type, Fq6Type, FqType,
-};
-use super::{assigner::BCAssigner, segment::Segment};
-use crate::bn254::curves::{G1Affine, G2Affine};
-use crate::bn254::{ell_coeffs::EllCoeff, fp254impl::Fp254Impl, fq::Fq, fq12::Fq12, fq2::Fq2};
-use crate::treepp::*;
-use ark_ff::{AdditiveGroup, Field};
-
-pub fn chunk_evaluate_line_wrapper<T: BCAssigner>(
-    assigner: &mut T,
-    prefix: &str,
-    f: ark_bn254::Fq12,
-    x: ark_bn254::Fq,
-    y: ark_bn254::Fq,
-    constant: &EllCoeff,
-) -> (Vec<Segment>, Fq12Type) {
-    let mut pf = Fq12Type::new(assigner, &format!("{}{}", prefix, "f"));
-    pf.fill_with_data(Fq12Data(f));
-    let mut pxy = Fq2Type::new(assigner, &format!("{}{}", prefix, "xy"));
-    pxy.fill_with_data(Fq2Data(ark_bn254::Fq2::new(x, y)));
-
-    chunk_evaluate_line(assigner, prefix, pf, pxy, f, x, y, constant)
-}
-
-pub fn chunk_evaluate_line<T: BCAssigner>(
-    assigner: &mut T,
-    prefix: &str,
-    pf: Fq12Type,
-    pxy: Fq2Type,
-    f: ark_bn254::Fq12,
-    x: ark_bn254::Fq,
-    y: ark_bn254::Fq,
-    constant: &EllCoeff,
-) -> (Vec<Segment>, Fq12Type) {
-    assert_eq!(constant.0, ark_bn254::Fq2::ONE);
-
-    let (hinted_script1, hint1) = Fq::hinted_mul_by_constant_stable(x, &constant.1.c0);
-    let (hinted_script2, hint2) = Fq::hinted_mul_by_constant_stable(x, &constant.1.c1);
-    let (hinted_script3, hint3) = Fq::hinted_mul_by_constant_stable(y, &constant.2.c0);
-    let (hinted_script4, hint4) = Fq::hinted_mul_by_constant_stable(y, &constant.2.c1);
-    let mut c1 = constant.1;
-    c1.mul_assign_by_fp(&x);
-    let mut c2 = constant.2;
-    c2.mul_assign_by_fp(&y);
-
-    let script_lines_0 = vec![
-        // [x', y']
-        // update c1, c1' = x' * c1
-        Fq::copy(1),
-        hinted_script1,
-        // [ x', y', x' * c1.0]
-        Fq::roll(2),
-        hinted_script2,
-        // [y', x' * c1.0, x' * c1.1]
-        // [y', x' * c1]
-
-        // update c2, c2' = -y' * c2
-        Fq::copy(2),
-        hinted_script3, // Fq::mul_by_constant(&constant.2.c0),
-        // [y', x' * c1, y' * c2.0]
-        Fq::roll(3),
-        hinted_script4,
-        // [x' * c1, y' * c2.0, y' * c2.1]
-        // [x' * c1, y' * c2]
-        // [c1', c2']
-    ];
-    let mut script_0 = script! {};
-    for script_line_0 in script_lines_0 {
-        script_0 = script_0.push_script(script_line_0.compile());
-    }
-    let mut hints_0 = Vec::new();
-    hints_0.extend(hint1);
-    hints_0.extend(hint2);
-    hints_0.extend(hint3);
-    hints_0.extend(hint4);
-    //
-
-    let mut tr0 = Fq6Type::new(assigner, &format!("{}{}", prefix, "c0"));
-    tr0.fill_with_data(Fq6Data(ark_bn254::Fq6::new(c1, c2, ark_bn254::Fq2::ZERO)));
-
-    let segment0 = Segment::new_with_name(
-        format!("{}seg1", prefix),
-        script! {
-            {script_0}
-            {Fq2::push_zero()}
-        },
-    )
-    .add_parameter(&pxy)
-    .add_result(&tr0)
-    .add_hint(hints_0);
-
-    let mut f1 = f;
-    f1.mul_by_034(&constant.0, &c1, &c2);
-    let c = f1;
-    let mut tc = Fq12Type::new(assigner, &format!("{}{}", prefix, "c"));
-    tc.fill_with_data(Fq12Data(c));
-
-    let (script_1, hint_1) = Fq12::hinted_mul_by_34(f, c1, c2);
-    //  // compute the new f with c1'(c3) and c2'(c4), where c1 is trival value 1
-    //  script_1,
-    // // [f, c1', c2']
-    //  // [f]
-    let segment1 = Segment::new_with_name(
-        format!("{}seg2", prefix),
-        script! {
-            {Fq2::drop()}
-            {script_1}
-        },
-    )
-    .add_parameter(&pf)
-    .add_parameter(&tr0)
-    .add_result(&tc)
-    .add_hint(hint_1);
-
-    (vec![segment0, segment1], tc)
-}
-
-#[cfg(test)]
-mod test {
-    use super::chunk_evaluate_line_wrapper;
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::utils::*;
-    use crate::chunker::elements;
-    use crate::chunker::{assigner::DummyAssinger, segment};
-    use crate::treepp::*;
-
-    use crate::execute_script_with_inputs;
-
-    use ark_ff::Field;
-    use ark_std::UniformRand;
-    use bitcoin::hashes::{sha256::Hash as Sha256, Hash};
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_ell() {
-        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(
-            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_not_montgomery(f) }
-            { from_eval_point_script }
-            { ell_by_constant_affine_script.clone() }
-            { fq12_push_not_montgomery(hint) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        println!("exec_result: {:}", exec_result);
-        assert!(exec_result.success);
-
-        //
-        let mut assigner = DummyAssinger::default();
-        let mut segments = Vec::new();
-        let fn_name = format!("F_{}_mul_c_1p{}", 0, 0);
-        let (segments_mul, mul): (Vec<segment::Segment>, elements::Fq12Type) =
-            chunk_evaluate_line_wrapper(
-                &mut assigner,
-                &fn_name,
-                f,
-                -p.x / p.y,
-                p.y.inverse().unwrap(),
-                &coeffs.ell_coeffs[0],
-            );
-        segments.extend(segments_mul);
-
-        for segment in segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            println!(
-                "segment script size {} witness size {} total {}",
-                script.len(),
-                lenw,
-                script.len() + lenw
-            );
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {}",
-                segment.name
-            );
-
-            let hash1 = Sha256::hash(segment.script.clone().compile().as_bytes());
-            let hash2 = Sha256::hash(script.clone().compile().as_bytes());
-            println!(
-                "segment {} hash {} {} ",
-                segment.name,
-                hash1.clone(),
-                hash2.clone()
-            );
-
-            let res = execute_script_with_inputs(script.clone(), witness.clone());
-            println!("segment exec_result: {}", res);
-
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-
-            let mut lenw = 0;
-            for w in witness {
-                lenw += w.len();
-            }
-            assert!(script.len() + lenw < 4000000, "script and witness len");
-        }
-    }
-}
diff --git a/src/chunker/chunk_fq12_multiplication.rs b/src/chunker/chunk_fq12_multiplication.rs
deleted file mode 100644
index 47155163d..000000000
--- a/src/chunker/chunk_fq12_multiplication.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use super::elements::{DataType::Fq12Data, DataType::Fq6Data, ElementTrait, Fq12Type, Fq6Type};
-use super::{assigner::BCAssigner, segment::Segment};
-use crate::bn254::fq12::Fq12;
-use crate::bn254::fq6::Fq6;
-use crate::treepp::*;
-use std::ops::{Add, Mul};
-
-/// a * b -> c
-pub fn fq12_mul_wrapper<T: BCAssigner>(
-    assigner: &mut T,
-    prefix: &str,
-    pa: Fq12Type,
-    pb: Fq12Type,
-    a: ark_bn254::Fq12,
-    b: ark_bn254::Fq12,
-) -> (Vec<Segment>, Fq12Type) {
-    chunk_fq12_multiplication(assigner, prefix, pa, pb, a, b)
-}
-
-/// a * b -> c
-pub fn chunk_fq12_multiplication<T: BCAssigner>(
-    assigner: &mut T,
-    prefix: &str,
-    pa: Fq12Type,
-    pb: Fq12Type,
-    a: ark_bn254::Fq12,
-    b: ark_bn254::Fq12,
-) -> (Vec<Segment>, Fq12Type) {
-    let c = a.mul(b);
-    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);
-
-    // intermediate states
-    let mut a0b0 = Fq6Type::new(assigner, &format!("{}{}", prefix, "a0b0"));
-    let mut a1b1 = Fq6Type::new(assigner, &format!("{}{}", prefix, "a1b1"));
-    // let mut a0_a1 = Fq6Type::new(assigner, &format!("{}{}", prefix, "a0_a1")); // means a0+a1
-    // let mut b0_b1 = Fq6Type::new(assigner, &format!("{}{}", prefix, "b0_b1")); // means b0+b1
-    let mut ab = Fq6Type::new(assigner, &format!("{}{}", prefix, "a0_a1 * b0_b1"));
-
-    a0b0.fill_with_data(Fq6Data(a.c0.mul(b.c0)));
-    a1b1.fill_with_data(Fq6Data(a.c1.mul(b.c1)));
-    // a0_a1.fill_with_data(Fq6Data(a.c0.add(a.c1)));
-    // b0_b1.fill_with_data(Fq6Data(b.c0.add(b.c1)));
-    ab.fill_with_data(Fq6Data(a.c0.add(a.c1).mul(b.c0.add(b.c1))));
-
-    // final states
-    // let mut c0 = Fq6Type::new(assigner, &format!("{}{}", prefix, "c0"));
-    // let mut c1 = Fq6Type::new(assigner, &format!("{}{}", prefix, "c1"));
-
-    // c0.fill_with_data(Fq6Data(c.c0));
-    // c1.fill_with_data(Fq6Data(c.c1));
-
-    let segment1 = Segment::new_with_name(
-        format!("{}{}", prefix, "a0 * b0"),
-        script! {
-            //[a0,a1, b0, b1]
-            {Fq6::drop()}
-            //[a0,a1, b0]
-            {Fq6::roll(6)}
-            //[a0, b0, a1]
-            {Fq6::drop()}
-            // [a0, b0]
-            {hinted_script1}
-        },
-    )
-    .add_parameter(&pa)
-    .add_parameter(&pb)
-    .add_result(&a0b0)
-    .add_hint(hint1);
-
-    let segment2 = Segment::new_with_name(
-        format!("{}{}", prefix, "a1 * b1"),
-        script! {
-            //[a0,a1, b0, b1]
-            {Fq6::roll(6)}
-            //[a0,a1, b1, b0]
-            {Fq6::drop()}
-            //[a0,a1, b1]
-            {Fq6::roll(12)}
-            //[a1, b1, a0]
-            {Fq6::drop()}
-            // [a1, b1]
-            {hinted_script2}
-        },
-    )
-    .add_parameter(&pa)
-    .add_parameter(&pb)
-    .add_result(&a1b1)
-    .add_hint(hint2);
-
-    let segment4 = Segment::new_with_name(
-        format!("{}{}", prefix, "(a0 + a1) * (b0 + b1)"),
-        script! {
-            {Fq6::add(0, 6)}
-            {Fq6::add(6, 12)}
-            {Fq6::roll(6)}
-            {hinted_script3}
-        },
-    )
-    .add_parameter(&pa)
-    .add_parameter(&pb)
-    .add_result(&ab)
-    .add_hint(hint3);
-
-    let mut tc = Fq12Type::new(assigner, &format!("{}{}", prefix, "c"));
-    tc.fill_with_data(Fq12Data(c));
-
-    let segment6 = Segment::new_with_name(
-        format!("{}{}", prefix, "fq6_to_fq12"),
-        script! {
-            // [ab, a0b0, a1b1]
-            {Fq6::copy(6)}
-            {Fq6::copy(6)}
-            // [ab, a0b0, a1b1, a0b0,a1b1]
-            {Fq12::mul_fq6_by_nonresidue()}
-            { Fq6::add(6, 0) }
-            // [ab, a0b0, a1b1, c0]
-            {Fq6::toaltstack()}
-            // [ab, a0b0, a1b1 | c0]
-            {Fq6::add(0, 6)}
-            {Fq6::sub(6, 0)}
-            // [c1 | c0]
-            {Fq6::fromaltstack()}
-            // [c1, c0]
-            {Fq6::roll(6)}
-            // [c0, c1]
-        },
-    )
-    .add_parameter(&ab)
-    .add_parameter(&a0b0)
-    .add_parameter(&a1b1)
-    .add_result(&tc);
-
-    (
-        vec![
-            segment1, segment2, /*segment3,*/ segment4,
-            /*segment5,*/ segment6, /*segment7,*/
-        ],
-        tc,
-    )
-}
-
-#[cfg(test)]
-mod test {
-    use super::fq12_mul_wrapper;
-    use crate::{
-        chunker::{
-            assigner::DummyAssinger,
-            elements::{DataType::Fq12Data, DataType::Fq6Data, ElementTrait, Fq12Type, Fq6Type},
-            segment::Segment,
-        },
-        execute_script_with_inputs,
-    };
-    use ark_ff::UniformRand;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::ops::Mul;
-
-    #[test]
-    fn test_fq12_wrapper() {
-        let mut assigner = DummyAssinger::default();
-
-        let mut a_type = Fq12Type::new(&mut assigner, "a");
-        let mut b_type = Fq12Type::new(&mut assigner, "b");
-
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-        let a = ark_bn254::Fq12::rand(&mut prng);
-        let b = ark_bn254::Fq12::rand(&mut prng);
-        let c = a.mul(&b);
-
-        // Output segment with data
-        a_type.fill_with_data(Fq12Data(a));
-        b_type.fill_with_data(Fq12Data(b));
-
-        let (filled_segments, c): (Vec<Segment>, Fq12Type) =
-            fq12_mul_wrapper(&mut assigner, "test_", a_type, b_type, a, b);
-
-        println!("segements num {}", filled_segments.len());
-
-        for segment in filled_segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let mut lenw = 0;
-            for w in witness.clone() {
-                lenw += w.len();
-            }
-            println!(
-                "segment name {} script size {} witness size {}",
-                segment.name,
-                segment.script.clone().len(),
-                lenw
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-        }
-    }
-}
diff --git a/src/chunker/chunk_g1_points.rs b/src/chunker/chunk_g1_points.rs
deleted file mode 100644
index c5230cbbf..000000000
--- a/src/chunker/chunk_g1_points.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use super::elements::DataType::{Fq2Data, G1PointData};
-use super::elements::{Fq2Type,G1PointType};
-
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::chunker::assigner::*;
-use crate::chunker::elements::ElementTrait;
-use crate::chunker::segment::Segment;
-use crate::treepp::script;
-
-use ark_bn254::Bn254;
-use ark_ff::Field;
-use ark_groth16::{Proof, VerifyingKey};
-use core::ops::Neg;
-
-pub fn g1_points<T: BCAssigner>(
-    assigner: &mut T,
-    g1p: G1PointType,
-    g1a: ark_bn254::G1Affine,
-    proof: &Proof<Bn254>,
-    vk: &VerifyingKey<Bn254>,
-) -> (Vec<Segment>, Vec<Fq2Type>) {
-    let mut segments = vec![];
-
-    let ( p2, p3, p4) = (proof.c, vk.alpha_g1, proof.a);
-    let mut g2p = G1PointType::new(assigner, "F_p2_init");
-    g2p.fill_with_data(G1PointData(p2));
-    let mut g3p = G1PointType::new(assigner, "F_p3_init");
-    g3p.fill_with_data(G1PointData(p3));
-    let mut g4p = G1PointType::new(assigner, "F_p4_init");
-    g4p.fill_with_data(G1PointData(p4));
-
-    let (s1, a1) = make_p(assigner,"F_p1_im".to_owned(), g1p, g1a);
-    let (s2, a2) = make_p(assigner,"F_p2_im".to_owned(), g2p, p2);
-    let (s3, a3) = make_p(assigner,"F_p3_im".to_owned(), g3p, p3);
-    let (s4, a4) = make_p(assigner,"F_p4_im".to_owned(), g4p, p4);
-
-    segments.extend(s1);
-    segments.extend(s2);
-    segments.extend(s3);
-    segments.extend(s4);
-
-    let im_var_p = vec![a1, a2, a3, a4];
-    (segments, im_var_p)
-}
-
-fn make_p<T: BCAssigner>(
-    assigner: &mut T,
-    prefix:String,
-    g1p: G1PointType,
-    g1a: ark_bn254::G1Affine,
-) -> (Vec<Segment>, Fq2Type) {
-    let mut segments = vec![];
-
-    let p1 = g1a;
-    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 script_p1 = script! {
-        { hinted_script1 } // Fq::inv()
-        { Fq::copy(0) }
-        { Fq::roll(2) }
-        { Fq::neg(0) }
-        { hinted_script2 } // Fq::mul()
-        { Fq::roll(1) }
-    };
-    
-    let mut hints_p1 = Vec::new();
-    hints_p1.extend(hint1);
-    hints_p1.extend(hint2);
-
-    let mut result_p = Fq2Type::new(assigner, &format!("{}_o_a", prefix));
-    result_p.fill_with_data(Fq2Data(ark_bn254::Fq2::new(-p1.x / p1.y, p1.y.inverse().unwrap())));
-
-    segments.push(
-        Segment::new_with_name(prefix, script_p1)
-            .add_parameter(&g1p)
-            .add_result(&result_p.clone())
-            .add_hint(hints_p1),
-    );
-
-    (segments, result_p)
-}
-
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::msm::hinted_msm_with_constant_bases_affine;
-    use crate::chunker::elements::DataType::G1PointData;
-    use crate::{execute_script_with_inputs, execute_script_without_stack_limit};
-
-    use ark_ec::{CurveGroup, VariableBaseMSM};
-    use ark_std::{end_timer, start_timer, test_rng,UniformRand};
-
-    #[test]
-    fn test_make_p() {
-        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 (msm, hints) = hinted_msm_with_constant_bases_affine(&bases, &scalars);
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            for hint in hints {
-                { hint.push() }
-            }
-
-            { msm.clone() }
-            // { g1_affine_push_not_montgomery(expect) }
-            // { G1Affine::equalverify() }
-            // OP_TRUE
-        };
-        end_timer!(start);
-
-        println!("hinted_msm_with_constant_bases: = {} bytes", msm.len());
-        let start = start_timer!(|| "execute_msm_script");
-        let exec_result = execute_script_without_stack_limit(script);
-        end_timer!(start);
-        // assert!(exec_result.success);
-        println!("exec_result {}", exec_result);
-
-        let mut assigner = DummyAssinger::default();
-        let g1a = expect;
-        let mut g1p = G1PointType::new(&mut assigner, "test");
-        g1p.fill_with_data(G1PointData(g1a));
-        let (segments, a) = make_p(&mut assigner, "test".to_owned(), g1p, g1a);
-
-        for segment in segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let res = execute_script_with_inputs(script.clone(), witness.clone());
-            println!("segment exec_result: {}", res);
-
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-
-            let mut lenw = 0;
-            for w in witness {
-                lenw += w.len();
-            }
-            assert!(script.len() + lenw < 4000000, "script and witness len");
-        }
-    }
-}
diff --git a/src/chunker/chunk_groth16_verifier.rs b/src/chunker/chunk_groth16_verifier.rs
deleted file mode 100644
index 4f3a19458..000000000
--- a/src/chunker/chunk_groth16_verifier.rs
+++ /dev/null
@@ -1,435 +0,0 @@
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::chunker::chunk_g1_points::g1_points;
-use crate::chunker::chunk_msm::chunk_hinted_msm_with_constant_bases_affine;
-use crate::chunker::chunk_non_fixed_point::chunk_q4;
-use crate::chunker::elements::{ElementTrait, FrType, G2PointType};
-use crate::chunker::{chunk_accumulator, chunk_hinted_accumulator};
-use crate::groth16::constants::{LAMBDA, P_POW3};
-use crate::groth16::offchain_checker::compute_c_wi;
-use crate::log_assert_eq;
-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::assigner::BCAssigner;
-use super::segment::Segment;
-
-/// This function outputs a vector segment, which is equivalent to the plain groth16 verifier.
-/// Each segment will generate script and witness for each branch of disprove transaction.
-/// Bitcommitments are collected into assinger.
-pub fn groth16_verify_to_segments<T: BCAssigner>(
-    assigner: &mut T,
-    public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-    proof: &Proof<Bn254>,
-    vk: &VerifyingKey<Bn254>,
-) -> Vec<Segment> {
-    let scalars = [
-        vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-        public_inputs.clone(),
-    ]
-    .concat();
-    let msm_g1 = G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-
-    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,
-    );
-
-    // 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())
-    };
-
-    log_assert_eq!(hint, c.pow(P_POW3.to_u64_digits()), "hint isn't correct!");
-
-    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 mut segments = vec![];
-
-    // skip the first scalar
-    let mut scalar_types = vec![FrType::new_dummy("scalar_0")];
-    for (idx, scalar) in scalars.iter().enumerate().skip(1) {
-        let mut scalar_type = FrType::new(assigner, &format!("scalar_{}", idx));
-        scalar_type.fill_with_data(crate::chunker::elements::DataType::FrData(*scalar));
-        scalar_types.push(scalar_type);
-    }
-
-    // calculate p1
-    let (segment, p1_type) = chunk_hinted_msm_with_constant_bases_affine(
-        assigner,
-        &vk.gamma_abc_g1,
-        &scalars,
-        &scalar_types,
-    );
-
-    segments.extend(segment);
-
-    let (segment, tp_lst) = g1_points(assigner, p1_type, p1, proof, vk);
-    segments.extend(segment);
-
-    let (segment, fs, f) = chunk_accumulator::chunk_accumulator(
-        assigner,
-        tp_lst,
-        q_prepared.to_vec(),
-        c,
-        c_inv,
-        wi,
-        p_lst,
-    );
-    segments.extend(segment);
-
-    let segment = chunk_hinted_accumulator::verify_accumulator(fs);
-    segments.extend(segment);
-
-    let mut q4_input = G2PointType::new(assigner, "q4");
-    q4_input.fill_with_data(crate::chunker::elements::DataType::G2PointData(q4));
-    let segment = chunk_q4(q_prepared.to_vec(), q4, q4_input, assigner);
-
-    segments.extend(segment);
-
-    segments
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::chunker::assigner::*;
-    use crate::chunker::chunk_groth16_verifier::groth16_verify_to_segments;
-    use crate::chunker::{common::*, elements::ElementTrait};
-    use crate::execute_script_with_inputs;
-    use crate::treepp::*;
-
-    use ark_bn254::g1::G1Affine;
-    use ark_bn254::Bn254;
-    use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
-    use ark_ec::pairing::Pairing;
-    use ark_ff::{BigInt, PrimeField};
-    use ark_groth16::Groth16;
-    use ark_groth16::{ProvingKey, VerifyingKey};
-    use ark_relations::lc;
-    use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
-    use ark_std::{test_rng, UniformRand};
-    use bitcoin::hashes::{sha256::Hash as Sha256, Hash};
-    use rand::{RngCore, SeedableRng};
-    use std::collections::HashMap;
-
-    #[derive(Default)]
-    struct StatisticAssinger {
-        commitments: HashMap<String, u32>,
-    }
-    impl StatisticAssinger {
-        fn new() -> StatisticAssinger {
-            StatisticAssinger {
-                commitments: HashMap::new(),
-            }
-        }
-        fn commitment_count(&self) -> usize {
-            
-            self.commitments.len()
-        }
-    }
-
-    impl BCAssigner for StatisticAssinger {
-        fn create_hash(&mut self, id: &str) {
-            if self.commitments.contains_key(id) {
-                panic!("varible name is repeated, check {}", id);
-            }
-            self.commitments.insert(id.to_owned(), 1);
-        }
-
-        fn locking_script<T: ElementTrait + ?Sized>(&self, _: &Box<T>) -> Script {
-            script! {}
-        }
-
-        fn get_witness<T: ElementTrait + ?Sized>(&self, element: &Box<T>) -> RawWitness {
-            element.to_hash_witness().unwrap()
-        }
-
-        fn all_intermediate_scripts(&self) -> Vec<Vec<Script>> {
-            todo!()
-        }
-
-        fn all_intermediate_witnesses(
-            &self,
-            elements: std::collections::BTreeMap<String, std::rc::Rc<Box<dyn ElementTrait>>>,
-        ) -> Vec<Vec<RawWitness>> {
-            todo!()
-        }
-
-        fn recover_from_witness(
-            &mut self,
-            witnesses: Vec<Vec<RawWitness>>,
-        ) -> std::collections::BTreeMap<String, BLAKE3HASH> {
-            todo!()
-        }
-    }
-
-    #[derive(Copy)]
-    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(())
-        }
-    }
-
-    #[test]
-    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());
-        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 mut proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
-
-        let mut assigner = StatisticAssinger::new();
-
-        let segments = groth16_verify_to_segments(&mut assigner, &vec![c], &proof, &vk);
-
-        let mut small_segment_size = 0;
-
-        for (_, segment) in tqdm::tqdm(segments.iter().enumerate()) {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            if script.len() < 1600 * 1000 {
-                small_segment_size += 1;
-            }
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {}",
-                segment.name
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{} in {}",
-                res.stats.max_nb_stack_items,
-                segment.name
-            );
-        }
-
-        println!("segments number: {}", segments.len());
-        println!("small_segment_size: {}", small_segment_size);
-        println!("assign commitment size {}", assigner.commitment_count());
-    }
-
-    #[test]
-    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::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,
-        };
-        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 mut assigner = DummyAssinger {};
-        let mut assigner = StatisticAssinger::new();
-
-        let segments = groth16_verify_to_segments(&mut assigner, &vec![c], &proof, &vk);
-
-        let mut small_segment_size = 0;
-
-        for (_, segment) in tqdm::tqdm(segments.iter().enumerate()) {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            if script.len() < 1600 * 1000 {
-                small_segment_size += 1;
-            }
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {}",
-                segment.name
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{} in {}",
-                res.stats.max_nb_stack_items,
-                segment.name
-            );
-        }
-
-        println!("segments number: {}", segments.len());
-        println!("small_segment_size: {}", small_segment_size);
-        println!("assign commitment size {}", assigner.commitment_count());
-    }
-
-    #[test]
-    fn test_hinted_groth16_verifier_stable() {
-        type E = Bn254;
-        let k = 6;
-        let mut rng: rand::prelude::StdRng =
-            ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
-        let circuit: DummyCircuit<<ark_ec::bn::Bn<ark_bn254::Config> as Pairing>::ScalarField> =
-            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 mut segmentes = vec![];
-        let mut hashes = vec![];
-        let count = 2;
-        for i in 0..count {
-            println!("generate hash {}", i);
-            // let (hash, segment) = test_hinted_groth16_verifier_stable_tool();
-            let hash = test_hinted_groth16_verifier_stable_tool(&mut rng, &pk, &vk);
-
-            hashes.push(hash);
-            // segmentes.push(segment)
-        }
-        for i in 1..count {
-            assert_eq!(
-                hashes[i].len(),
-                hashes[i - 1].len(),
-                "test{} len {}",
-                i,
-                hashes[i].len()
-            );
-
-            for j in 0..hashes[i].len() {
-                // assert_eq!(hashes[i][j] , hashes[i-1][j], "segment  {} {} name {}", i, j, segmentes[i][j].name);
-                assert_eq!(hashes[i][j], hashes[i - 1][j], "segment  {} {} ", i, j);
-            }
-        }
-    }
-
-    // fn test_hinted_groth16_verifier_stable_tool() -> (Vec<Sha256>, Vec<Segment>) {
-    fn test_hinted_groth16_verifier_stable_tool(
-        rng: &mut rand::prelude::StdRng,
-        pk: &ProvingKey<Bn254>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> Vec<Sha256> {
-        type E = Bn254;
-        let k = 6;
-        // let mut rng: rand::prelude::StdRng = 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(rng)),
-            b: Some(<E as Pairing>::ScalarField::rand(rng)),
-            num_variables: 10,
-            num_constraints: 1 << k,
-        };
-        let c = circuit.a.unwrap() * circuit.b.unwrap();
-
-        let proof = Groth16::<E>::prove(pk, circuit, rng).unwrap();
-
-        let mut assigner = DummyAssinger::default();
-        let segments = groth16_verify_to_segments(&mut assigner, &vec![c], &proof, &vk);
-
-        println!("segments number: {}", segments.len());
-
-        let mut hashes = vec![];
-        for (i, segment) in tqdm::tqdm(segments.iter().enumerate()) {
-            let script = segment.script(&assigner);
-            let hash = Sha256::hash(script.compile().as_bytes());
-            println!("segment {} {} hash {}", i, segment.name, hash.clone());
-
-            hashes.push(hash);
-        }
-
-        // (hashes, segments)
-        hashes
-    }
-}
diff --git a/src/chunker/chunk_hinted_accumulator.rs b/src/chunker/chunk_hinted_accumulator.rs
deleted file mode 100644
index 52b571e92..000000000
--- a/src/chunker/chunk_hinted_accumulator.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-use super::common::not_equal;
-use super::elements::Fq12Type;
-use super::segment::Segment;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::utils::fq12_push_not_montgomery;
-use crate::treepp::*;
-
-pub fn verify_accumulator(pa: Fq12Type) -> Vec<Segment> {
-    let script = script! {
-        {fq12_push_not_montgomery(<ark_bn254::Fq12 as ark_ff::Field>::ONE)}
-        {not_equal(Fq::N_LIMBS as usize * 12)}
-    };
-
-    let mut segments = vec![];
-    let segment = Segment::new_with_name(format!("{}", "verify_f"), script)
-        .add_parameter(&pa)
-        .mark_final();
-
-    segments.push(segment);
-    segments
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fp254impl::Fp254Impl;
-
-    use crate::chunker::assigner::*;
-    use crate::chunker::chunk_accumulator::*;
-    use crate::chunker::chunk_g1_points::*;
-    use crate::chunker::elements::DataType::G1PointData;
-    use crate::chunker::elements::{DataType::Fq12Data, ElementTrait, G1PointType};
-    use crate::execute_script_with_inputs;
-    use crate::groth16::constants::{LAMBDA, P_POW3};
-    use crate::groth16::offchain_checker::compute_c_wi;
-
-    use ark_bn254::Bn254;
-    use ark_bn254::G1Projective;
-    use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
-    use ark_ec::pairing::Pairing as ark_Pairing;
-    use ark_ec::{pairing::Pairing, AffineRepr, CurveGroup, VariableBaseMSM};
-    use ark_ff::{Field, PrimeField};
-    use ark_groth16::Groth16;
-    use ark_groth16::{Proof, VerifyingKey};
-    use ark_relations::lc;
-    use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
-    use ark_std::{test_rng, UniformRand};
-
-    use core::ops::Neg;
-    use rand::RngCore;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-
-    #[derive(Copy)]
-    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(())
-        }
-    }
-
-    pub fn generate_p1<T: BCAssigner>(
-        assigner: &mut T,
-        public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> (ark_bn254::G1Affine, G1PointType) {
-        let scalars = [
-            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-            public_inputs.clone(),
-        ]
-        .concat();
-        let msm_g1 =
-            G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-
-        let g1a = msm_g1.into_affine();
-        let mut g1p = G1PointType::new(assigner, "test");
-        g1p.fill_with_data(G1PointData(g1a));
-
-        (g1a, g1p)
-    }
-
-    pub fn generate_f_arg(
-        public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-        proof: &Proof<Bn254>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> (
-        Vec<G2Prepared>,
-        ark_bn254::Fq12,
-        ark_bn254::Fq12,
-        ark_bn254::Fq12,
-        Vec<ark_bn254::G1Affine>,
-        ark_bn254::G2Affine,
-    ) {
-        // 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,
-
-        let scalars = [
-            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-            public_inputs.clone(),
-        ]
-        .concat();
-        let msm_g1 =
-            G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-
-        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 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];
-        (q_prepared.to_vec(), c, c_inv, wi, p_lst, q4)
-    }
-
-    pub fn generate_f(
-        public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-        proof: &Proof<Bn254>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> ark_bn254::Fq12 {
-        let scalars = [
-            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-            public_inputs.clone(),
-        ]
-        .concat();
-        let msm_g1 =
-            G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-        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,
-        );
-        // 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!");
-        hint
-    }
-
-    fn test_g1_points() {
-        let mut assigner = DummyAssinger::default();
-
-        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 (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&vec![c], &proof, &vk);
-        let (g1a, g1p) = generate_p1(&mut assigner, &vec![c], &vk);
-        let (segments, plist) = g1_points(&mut assigner, g1p, g1a, &proof, &vk);
-
-        println!("segments len {}", segments.len());
-        for segment in segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let res = execute_script_with_inputs(script.clone(), witness.clone());
-            println!("segment exec_result: {}", res);
-
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-
-            let mut lenw = 0;
-            for w in witness {
-                lenw += w.len();
-            }
-            assert!(script.len() + lenw < 4000000, "script and witness len");
-        }
-    }
-
-    #[test]
-    fn test_chunk_accumulator() {
-        let mut assigner = DummyAssinger::default();
-
-        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 mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-        let rc = ark_bn254::Fq12::rand(&mut prng);
-        let mut tc = Fq12Type::new(&mut assigner, &format!("{}{}", "test".to_owned(), "c"));
-        tc.fill_with_data(Fq12Data(rc));
-        let tf = generate_f(&vec![c], &proof, &vk);
-        let mut tc = Fq12Type::new(&mut assigner, &format!("{}{}", "test".to_owned(), "c1"));
-        tc.fill_with_data(Fq12Data(tf));
-
-        // let (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&vec![c], &proof, &vk);
-        let (g1a, g1p) = generate_p1(&mut assigner, &vec![c], &vk);
-        let (segments, tp_lst) = g1_points(&mut assigner, g1p, g1a, &proof, &vk);
-
-        let (constants, c, c_inv, wi, p_lst, q4) = generate_f_arg(&vec![c], &proof, &vk);
-        let (segments, fs, f) =
-            chunk_accumulator(&mut assigner, tp_lst, constants, c, c_inv, wi, p_lst);
-        println!("tf: {} \n f: {}", tf, f);
-        println!("tc: {:?} \n fs: {:?}", tc, fs);
-
-        println!("segments len {}", segments.len());
-        for segment in segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let res = execute_script_with_inputs(script.clone(), witness.clone());
-            println!("segment exec_result: {}", res);
-
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-
-            let mut lenw = 0;
-            for w in witness {
-                lenw += w.len();
-            }
-            assert!(script.len() + lenw < 4000000, "script and witness len");
-        }
-    }
-
-    #[test]
-    fn test_verify_accumulator() {
-        let mut assigner = DummyAssinger::default();
-
-        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 mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
-        let rc = ark_bn254::Fq12::rand(&mut prng);
-        let mut tc = Fq12Type::new(&mut assigner, &format!("{}{}", "test".to_owned(), "c"));
-        tc.fill_with_data(Fq12Data(rc));
-        let f = generate_f(&vec![c], &proof, &vk);
-        let mut tc1 = Fq12Type::new(&mut assigner, &format!("{}{}", "test".to_owned(), "c1"));
-        tc1.fill_with_data(Fq12Data(f));
-
-        let segments = verify_accumulator(tc1);
-        println!("segments len {}", segments.len());
-        for segment in segments {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let res = execute_script_with_inputs(script.clone(), witness.clone());
-            println!("segment exec_result: {}", res);
-
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-
-            let mut lenw = 0;
-            for w in witness {
-                lenw += w.len();
-            }
-            assert!(script.len() + lenw < 4000000, "script and witness len");
-        }
-    }
-}
diff --git a/src/chunker/chunk_msm.rs b/src/chunker/chunk_msm.rs
deleted file mode 100644
index 030600edf..000000000
--- a/src/chunker/chunk_msm.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::bn254::msm::prepare_msm_input;
-use crate::chunker::chunk_scalar_mul::chunk_hinted_scalar_mul_by_constant;
-use crate::chunker::elements::DataType::G1PointData;
-use ark_ec::CurveGroup;
-use ark_ff::Field;
-use bitcoin_script::script;
-
-use super::assigner::BCAssigner;
-use super::elements::FrType;
-use super::segment::Segment;
-use crate::{
-    bn254::curves::G1Affine,
-    chunker::elements::{ElementTrait, G1PointType},
-};
-
-/// With constant bases, this function generate all msm-related segments
-/// and return the result additionally.
-pub fn chunk_hinted_msm_with_constant_bases_affine<T: BCAssigner>(
-    assigner: &mut T,
-    bases: &[ark_bn254::G1Affine],
-    scalars: &[ark_bn254::Fr],
-    scalar_types: &[FrType],
-) -> (Vec<Segment>, G1PointType) {
-    println!("use hinted_msm_with_constant_bases_affine");
-    assert_eq!(bases.len(), scalars.len());
-    assert_eq!(scalar_types.len(), scalars.len());
-    assert_eq!(scalars[0], ark_bn254::Fr::ONE);
-
-    let mut segments = vec![];
-
-    let len = bases.len();
-    let i_step = 12_u32;
-    let (inner_coeffs, outer_coeffs) = prepare_msm_input(bases, scalars, i_step);
-
-    let mut type_acc = G1PointType::new(assigner, "msm_init");
-    type_acc.fill_with_data(G1PointData(bases[0]));
-
-    // 1. init the sum=0;
-    let mut p = (bases[0] * scalars[0]).into_affine();
-    let is_scalar_one = false;
-
-    for i in 0..len {
-        let mut c = bases[i];
-        if i == 0 {
-            let segment = Segment::new_with_name(
-                format!("msm_add_{}", i),
-                script! {
-                    {G1Affine::push_not_montgomery(bases[i])}
-                },
-            )
-            .add_result(&type_acc);
-            segments.push(segment);
-            continue;
-        }
-
-        let (segment, mul_result) = chunk_hinted_scalar_mul_by_constant(
-            assigner,
-            &format!("msm_{}", i),
-            scalars[i],
-            scalar_types[i].clone(),
-            &mut c,
-            inner_coeffs[i].0.clone(),
-            inner_coeffs[i].1.clone(),
-            inner_coeffs[i].2.clone(),
-        );
-        segments.extend(segment);
-
-        // check coeffs before using
-        let (hinted_script, hint) =
-            G1Affine::hinted_check_add(p, c, outer_coeffs[i - 1].0); // outer_coeffs[i - 1].1
-
-        p = (p + c).into_affine();
-
-        let mut update = G1PointType::new(assigner, &format!("msm_update_{}", i));
-        update.fill_with_data(G1PointData(p));
-        let segment = Segment::new_with_name(
-            format!("msm_add_{}", i),
-            script! {
-                {hinted_script}
-            },
-        )
-        .add_parameter(&type_acc)
-        .add_parameter(&mul_result)
-        .add_result(&update)
-        .add_hint(hint);
-
-        segments.push(segment);
-
-        type_acc = update;
-    }
-    (segments, type_acc)
-}
-
-#[cfg(test)]
-mod tests {
-    use ark_ec::CurveGroup;
-    use ark_ff::{Field, UniformRand};
-    use ark_std::test_rng;
-
-    use crate::{
-        chunker::{
-            assigner::DummyAssinger,
-            elements::{ElementTrait, FrType},
-        },
-        execute_script_with_inputs,
-    };
-
-    use super::chunk_hinted_msm_with_constant_bases_affine;
-
-    #[test]
-    fn test_hinted_msm_with_constant_bases_affine_script() {
-        let k = 2;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-        let mut assigner = DummyAssinger::default();
-
-        let scalars = (0..n - 1)
-            .map(|_| ark_bn254::Fr::rand(rng))
-            .collect::<Vec<_>>();
-
-        let scalars = [vec![ark_bn254::Fr::ONE], scalars].concat();
-
-        let bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        let mut scalar_types = vec![];
-        for (idx, scalar) in scalars.iter().enumerate() {
-            let mut scalar_type = FrType::new(&mut assigner, &format!("scalar_{}", idx));
-            scalar_type.fill_with_data(crate::chunker::elements::DataType::FrData(*scalar));
-            scalar_types.push(scalar_type);
-        }
-
-        let (segments, p1) = chunk_hinted_msm_with_constant_bases_affine(
-            &mut assigner,
-            &bases,
-            &scalars,
-            &scalar_types,
-        );
-
-        println!("segments number {}", segments.len());
-
-        for segment in segments.iter() {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {}",
-                segment.name
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-        }
-    }
-}
diff --git a/src/chunker/chunk_non_fixed_point.rs b/src/chunker/chunk_non_fixed_point.rs
deleted file mode 100644
index e45ae5937..000000000
--- a/src/chunker/chunk_non_fixed_point.rs
+++ /dev/null
@@ -1,414 +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::fq2::Fq2;
-use crate::bn254::utils::*;
-use crate::chunker::elements::ElementTrait;
-use crate::treepp::*;
-use ark_ec::bn::BnConfig;
-use ark_ff::{AdditiveGroup, Field};
-use bitcoin::opcodes::OP_FALSE;
-use num_bigint::BigUint;
-use num_traits::One;
-use std::{ops::Neg, str::FromStr};
-
-use super::assigner::BCAssigner;
-use super::elements::G2PointType;
-use super::segment::Segment;
-
-pub fn chunk_q4<T: BCAssigner>(
-    constants: Vec<G2Prepared>,
-    q4: ark_bn254::G2Affine,
-    q4_input: G2PointType,
-    assigner: &mut T,
-) -> Vec<Segment> {
-    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 segments = vec![];
-
-    // 1. copy q4 to t4
-    let mut t4 = q4;
-
-    let mut t4_acc = G2PointType::new(assigner, "t4_init");
-    t4_acc.fill_with_data(crate::chunker::elements::DataType::G2PointData(t4));
-    let segment = Segment::new_with_name("copy_q4_to_t4".into(), script! {})
-        .add_parameter(&q4_input)
-        .add_result(&t4_acc);
-    segments.push(segment);
-
-    // 2. looped double-add
-    for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-        for j in 0..num_line_groups {
-            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 mut hints = vec![];
-                let (hinted_script0, hint) = hinted_check_tangent_line(
-                    t4,
-                    line_coeffs[num_lines - (i + 2)][j][0].1,
-                    line_coeffs[num_lines - (i + 2)][j][0].2,
-                );
-                hints.extend(hint);
-
-                let (hinted_script1, 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,
-                );
-                hints.extend(hint);
-
-                let mut t4_update = G2PointType::new(assigner, &format!("T4_{}_double", i));
-                t4_update.fill_with_data(crate::chunker::elements::DataType::G2PointData(t4x));
-                let segment = Segment::new_with_name(
-                    format!("check and double_{}", i),
-                    script! {
-                        { Fq2::copy(2) }
-                        { Fq2::toaltstack() }
-                        // [t4 | t4.x]
-                        {hinted_script0}
-                        { Fq2::fromaltstack() }
-                        // [t4.x]
-                        {hinted_script1}
-                        // [t4']
-                    },
-                )
-                .add_parameter(&t4_acc)
-                .add_result(&t4_update)
-                .add_hint(hints);
-
-                segments.push(segment);
-
-                t4 = t4x;
-                t4_acc = t4_update;
-            }
-        }
-
-        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 {
-                if j == num_constant {
-                    let mut script = script! {};
-                    let mut hints = vec![];
-
-                    let mut pm_q4 = q4;
-                    if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                        pm_q4 = q4.neg();
-                        script = script.push_script(Fq2::neg(0).compile());
-                    }
-                    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_script0, 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,
-                    );
-                    hints.extend(hint);
-
-                    let (hinted_script1, 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,
-                    );
-                    hints.extend(hint);
-
-                    script = script.push_script(
-                        script! {
-                            // [t4, pm_q4]
-                            {Fq2::copy(2)}
-                            {Fq2::toaltstack()}
-                            {Fq2::copy(6)}
-                            {Fq2::toaltstack()}
-                            // [t4, pm_q4]
-                            {hinted_script0}
-                            {Fq2::fromaltstack()}
-                            {Fq2::fromaltstack()}
-                            // [t4.x, pm_q4.x]
-                            {hinted_script1}
-                            // [updated_t4]
-                        }
-                        .compile(),
-                    );
-
-                    let mut t4_update = G2PointType::new(assigner, &format!("T4_{}_add", i));
-                    t4_update.fill_with_data(crate::chunker::elements::DataType::G2PointData(t4x));
-                    let segment = Segment::new_with_name(format!("check and add{}", i), script)
-                        .add_parameter(&t4_acc)
-                        .add_parameter(&q4_input)
-                        .add_result(&t4_update)
-                        .add_hint(hints);
-                    segments.push(segment);
-
-                    t4 = t4x;
-                    t4_acc = t4_update;
-                }
-            }
-        }
-    }
-
-    // 3. phi_Q4
-    for j in 0..num_line_groups {
-        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 hints = vec![];
-
-            let mut q4y = q4.y;
-            q4y.conjugate_in_place();
-            let (q4y_mul_hinted_script, hint) = Fq2::hinted_mul(2, q4y, 0, beta_13);
-            hints.extend(hint);
-            q4y *= beta_13;
-
-            let mut q4x = q4.x;
-            q4x.conjugate_in_place();
-            let (q4x_mul_hinted_script, hint) = Fq2::hinted_mul(2, q4x, 0, beta_12);
-            hints.extend(hint);
-            q4x *= beta_12;
-
-            // ================================
-
-            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 (check_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,
-            );
-            hints.extend(hint);
-
-            let (add_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,
-            );
-            hints.extend(hint);
-
-            let script = script! {
-                // [t4, q4]
-                {Fq::neg(0)}
-                { Fq::push_dec_not_montgomery("2821565182194536844548159561693502659359617185244120367078079554186484126554") }
-                { Fq::push_dec_not_montgomery("3505843767911556378687030309984248845540243509899259641013678093033130930403") }
-                // [t4, q4.x -q4.y, beta13]
-                { q4y_mul_hinted_script }
-                { Fq2::toaltstack() }
-
-                {Fq::neg(0)}
-                // [t4, -q4.x]
-                { Fq::push_dec_not_montgomery("21575463638280843010398324269430826099269044274347216827212613867836435027261") }
-                { Fq::push_dec_not_montgomery("10307601595873709700152284273816112264069230130616436755625194854815875713954") }
-                // [t4, q4x, beta12]
-                { q4x_mul_hinted_script }
-                { Fq2::fromaltstack() }
-
-                // [t4, phi_q4]
-                {Fq2::copy(2)}
-                {Fq2::toaltstack()}
-                {Fq2::copy(6)}
-                {Fq2::toaltstack()}
-                // [t4, phi_q4]
-                {check_hinted_script}
-                {Fq2::fromaltstack()}
-                {Fq2::fromaltstack()}
-                // [t4.x, phi_q4.x]
-                {add_hinted_script}
-                // [updated_t4]
-            };
-
-            let mut t4_update = G2PointType::new(assigner, "T4_final_add");
-            t4_update.fill_with_data(crate::chunker::elements::DataType::G2PointData(t4x));
-            let segment = Segment::new_with_name("final check and add".into(), script)
-                .add_parameter(&t4_acc)
-                .add_parameter(&q4_input)
-                .add_result(&t4_update)
-                .add_hint(hints);
-            segments.push(segment);
-
-            t4 = t4x;
-            t4_acc = t4_update;
-        }
-    }
-
-    // 4. phi_2_Q4 and Chord Check
-
-    for j in 0..num_line_groups {
-        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 mut hints = vec![];
-
-            let (mul_x_hinted_script, hint) = Fq2::hinted_mul(2, q4.x, 0, beta_22);
-            hints.extend(hint);
-
-            let q4_new = ark_bn254::G2Affine::new(q4.x * beta_22, q4.y);
-
-            let (check_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,
-            );
-            hints.extend(hint);
-
-            let script = script! {
-                // [t4, q4]
-                {Fq2::toaltstack()}
-                // [t4, q4x | q4y]
-                { Fq::push_dec_not_montgomery("21888242871839275220042445260109153167277707414472061641714758635765020556616") }
-                { Fq::push_zero() }
-                {mul_x_hinted_script}
-                { Fq2::fromaltstack() }
-                // [t4, q4x', q4y]
-                {check_hinted_script}
-            };
-
-            let segment = Segment::new_with_name("final_final check".into(), script)
-                .add_parameter(&t4_acc)
-                .add_parameter(&q4_input)
-                .add_hint(hints);
-            segments.push(segment);
-        }
-    }
-
-    segments
-}
-
-#[cfg(test)]
-mod tests {
-    use super::chunk_q4;
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::chunker::assigner::DummyAssinger;
-    use crate::chunker::elements::{ElementTrait, G2PointType};
-    use crate::execute_script_with_inputs;
-    use ark_std::UniformRand;
-    use bitcoin::hashes::{sha256::Hash as Sha256, Hash};
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_check_q4() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let mut assigner = DummyAssinger::default();
-
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        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 mut q4_input = G2PointType::new(&mut assigner, "q4");
-        q4_input.fill_with_data(crate::chunker::elements::DataType::G2PointData(q4));
-
-        let segments = chunk_q4(
-            [q1_prepared, q2_prepared, q3_prepared, q4_prepared].to_vec(),
-            q4,
-            q4_input,
-            &mut assigner,
-        );
-
-        println!("segments number :{}", segments.len());
-
-        // let witness = segments[91].witness(&assigner);
-        // let script = segments[91].script(&assigner);
-        // let res = execute_script_with_inputs(script, witness);
-        // println!("res: {}", res);
-
-        for segment in segments.iter() {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let hash1 = Sha256::hash(segment.script.clone().compile().as_bytes());
-            let hash2 = Sha256::hash(script.clone().compile().as_bytes());
-            println!(
-                "segment {} hash {} {} ",
-                segment.name,
-                hash1.clone(),
-                hash2.clone()
-            );
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {}",
-                segment.name
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "{}",
-                res.stats.max_nb_stack_items
-            );
-        }
-    }
-}
diff --git a/src/chunker/chunk_scalar_mul.rs b/src/chunker/chunk_scalar_mul.rs
deleted file mode 100644
index df3595467..000000000
--- a/src/chunker/chunk_scalar_mul.rs
+++ /dev/null
@@ -1,512 +0,0 @@
-use std::cmp::min;
-
-use ark_ec::{AffineRepr, CurveGroup};
-use ark_ff::{BigInteger, PrimeField};
-use bitcoin_script::script;
-
-use super::assigner::BCAssigner;
-use super::elements::FrType;
-use super::segment::Segment;
-use crate::{
-    bn254::{curves::G1Affine, fp254impl::Fp254Impl, fr::Fr},
-    chunker::elements::{ElementTrait, G1PointType},
-};
-
-/// This function do scalar multiplication in G1 curve group.
-/// Return all segements generated and the result of scalar multiplication.
-pub fn chunk_hinted_scalar_mul_by_constant<T: BCAssigner>(
-    assigner: &mut T,
-    prefix: &str,
-    scalar: ark_bn254::Fr,
-    scalar_type: FrType,
-    p: &mut ark_bn254::G1Affine,
-    coeff: Vec<(ark_bn254::Fq, ark_bn254::Fq)>,
-    step_p: Vec<ark_bn254::G1Affine>,
-    trace: Vec<ark_bn254::G1Affine>,
-) -> (Vec<Segment>, G1PointType) {
-    let mut segments = vec![];
-    let mut type_acc = G1PointType::new(assigner, &format!("{}_{}", prefix, 0));
-
-    let mut hints = vec![];
-    let mut coeff_iter = coeff.iter();
-    let mut step_p_iter = step_p.iter();
-    let mut trace_iter = trace.iter();
-    let mut loop_scripts = Vec::new();
-    let mut i = 0;
-    // options: i_step = 2-15
-    let i_step = 12;
-
-    // precomputed lookup table (affine)
-    let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
-    p_mul.push(ark_bn254::G1Affine::zero());
-    for _ in 1..(1 << i_step) {
-        p_mul.push((*p_mul.last().unwrap() + *p).into_affine());
-    }
-    let mut c: ark_bn254::G1Affine = ark_bn254::G1Affine::zero();
-    let scalar_bigint = scalar.into_bigint();
-
-    while i < Fr::N_BITS {
-        let depth = min(Fr::N_BITS - i, i_step);
-        // double(step-size) point
-        if i > 0 {
-            // divide this part into three to fit into 4mb chunk and 1000 stack limit
-            if depth > 2 * i_step / 3 {
-                for _ in 0..(i_step / 3) {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_1", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_1", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-
-                for _ in (i_step / 3)..(2 * i_step / 3) {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-    
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_2", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_2", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-
-                for _ in (2 * i_step / 3)..depth {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-    
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_3", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_3", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-            } else if depth > i_step / 3 {
-                for _ in 0..(i_step / 3) {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-    
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_1", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_1", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-
-                for _ in (i_step / 3)..depth {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-    
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_2", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_2", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-            } else {
-                for _ in 0..depth {
-                    let double_coeff = coeff_iter.next().unwrap();
-                    let step = step_p_iter.next().unwrap();
-                    let point_after_double = trace_iter.next().unwrap();
-
-                    let (double_loop_script, double_hints) = G1Affine::hinted_check_double(c);
-
-                    loop_scripts.push(double_loop_script);
-                    hints.extend(double_hints);
-
-                    c = (c + c).into_affine();
-                }
-
-                let mut segment_script = script! {};
-                for script in loop_scripts.clone() {
-                    segment_script = segment_script.push_script(script.compile());
-                }
-                loop_scripts.clear();
-
-                let mut update = G1PointType::new(assigner, &format!("{}_{}_piece_3", prefix, i));
-                update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-                let segment = Segment::new_with_name(
-                    format!("{}_loop_{}_piece_3", prefix, i),
-                    segment_script,
-                )
-                .add_parameter(&type_acc)
-                .add_result(&update)
-                .add_hint(hints.clone());
-                hints.clear();
-                segments.push(segment);
-
-                type_acc = update;
-            }
-        }
-
-        // squeeze a bucket scalar
-        loop_scripts.push(script! {
-            for _ in 0..i {
-                OP_FROMALTSTACK OP_DROP
-            }
-            for _ in 0..depth {
-                OP_FROMALTSTACK
-            }
-            for _ in 0..(Fr::N_BITS - i - depth) {
-                OP_FROMALTSTACK
-                OP_DROP
-            }
-        });
-
-        let mut mask = 0;
-
-        for j in 0..depth {
-            mask *= 2;
-            mask += scalar_bigint.get_bit((Fr::N_BITS - i - j - 1) as usize) as u32;
-        }
-
-        // add point
-        if i == 0 {
-            loop_scripts.push(G1Affine::dfs_with_constant_mul_not_montgomery(
-                0,
-                depth - 1,
-                0,
-                &p_mul,
-            ));
-            let point_after_add = trace_iter.next().unwrap();
-        } else {
-            let add_coeff = *coeff_iter.next().unwrap();
-            let point_after_add = trace_iter.next().unwrap();
-            let (add_script, add_hints) =
-            G1Affine::hinted_check_add(c, p_mul[mask as usize], add_coeff.0); // add_coeff.1
-
-            let add_loop = script! {
-                // query bucket point through lookup table
-                { G1Affine::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul) }
-                // check before usage
-                { add_script }
-            };
-            loop_scripts.push(add_loop.clone());
-            hints.extend(add_hints);
-        }
-        c = (c + p_mul[mask as usize]).into_affine();
-
-        let mut segment_script = script! {
-            { Fr::convert_to_le_bits_toaltstack() }
-        };
-        for script in loop_scripts.clone() {
-            segment_script = segment_script.push_script(script.compile());
-        }
-        loop_scripts.clear();
-
-        if i == 0 {
-            type_acc.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-            let segment = Segment::new_with_name(format!("{}_loop_{}", prefix, i), segment_script)
-                .add_parameter(&scalar_type)
-                .add_result(&type_acc)
-                .add_hint(hints.clone());
-            hints.clear();
-            segments.push(segment);
-        } else {
-            let mut update = G1PointType::new(assigner, &format!("{}_{}", prefix, i));
-            update.fill_with_data(crate::chunker::elements::DataType::G1PointData(c));
-            let segment = Segment::new_with_name(format!("{}_loop_{}", prefix, i), segment_script)
-                .add_parameter(&type_acc)
-                .add_parameter(&scalar_type)
-                .add_result(&update)
-                .add_hint(hints.clone());
-            hints.clear();
-            segments.push(segment);
-
-            type_acc = update;
-        }
-
-        i += i_step;
-    }
-    assert!(coeff_iter.next().is_none());
-    assert!(step_p_iter.next().is_none());
-    assert!(trace_iter.next().is_none());
-
-    println!("debug: c:{:?}", c);
-    *p = c;
-
-    (segments, type_acc)
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{
-        bn254::{curves::G1Affine, msm::prepare_msm_input},
-        chunker::{
-            assigner::DummyAssinger,
-            chunk_scalar_mul::chunk_hinted_scalar_mul_by_constant,
-            elements::{ElementTrait, FrType},
-        },
-        execute_script_with_inputs,
-        treepp::*,
-    };
-    
-    use ark_ec::{AffineRepr as _, CurveGroup};
-    use ark_ff::UniformRand;
-    use ark_std::test_rng;
-    use std::ops::Mul;
-
-    #[test]
-    fn test_stable_script() {
-        let k = 0;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-        let mut assigner = DummyAssinger::default();
-
-        let bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        // first run
-        let mut bases1 = bases.clone();
-        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
-        let q = bases[0].mul(scalars[0]).into_affine();
-        println!("debug: expected res:{:?}", q);
-        let (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-        let mut scalar_type = FrType::new(&mut assigner, "init");
-        scalar_type.fill_with_data(crate::chunker::elements::DataType::FrData(scalars[0]));
-
-        let (segments1, _) = chunk_hinted_scalar_mul_by_constant(
-            &mut assigner,
-            "g1_mul",
-            scalars[0],
-            scalar_type,
-            &mut bases1[0],
-            inner_coeffs[0].0.clone(),
-            inner_coeffs[0].1.clone(),
-            inner_coeffs[0].2.clone(),
-        );
-
-        // second run
-        let mut bases2 = bases.clone();
-        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
-        let q = bases[0].mul(scalars[0]).into_affine();
-        println!("debug: expected res:{:?}", q);
-        let (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-        let mut scalar_type = FrType::new(&mut assigner, "init");
-        scalar_type.fill_with_data(crate::chunker::elements::DataType::FrData(scalars[0]));
-
-        let (segments2, _) = chunk_hinted_scalar_mul_by_constant(
-            &mut assigner,
-            "g1_mul",
-            scalars[0],
-            scalar_type,
-            &mut bases2[0],
-            inner_coeffs[0].0.clone(),
-            inner_coeffs[0].1.clone(),
-            inner_coeffs[0].2.clone(),
-        );
-
-        assert_eq!(segments1.len(), segments2.len());
-        for (seg1, seg2) in segments1.into_iter().zip(segments2) {
-            if seg1.script.compile().into_bytes() != seg2.script.compile().into_bytes() {
-                println!("bad {} != {}", seg1.name, seg2.name);
-            } else {
-                println!("good {} == {}", seg1.name, seg2.name);
-            }
-        }
-    }
-
-    #[test]
-    fn test_dfs() {
-        let depth = 12;
-        let i_step = 12;
-
-        let rng = &mut test_rng();
-        let p = ark_bn254::G1Projective::rand(rng).into_affine();
-
-        // precomputed lookup table (affine)
-        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
-        p_mul.push(ark_bn254::G1Affine::zero());
-        for _ in 1..(1 << i_step) {
-            p_mul.push((*p_mul.last().unwrap() + p).into_affine());
-        }
-
-        let script1 = script! {
-            { G1Affine::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul) }
-        };
-
-        let script2 = script! {
-            { G1Affine::dfs_with_constant_mul_not_montgomery(0, depth - 1, 0, &p_mul) }
-        };
-
-        if script1.compile().into_bytes() != script2.compile().into_bytes() {
-            println!("bad");
-        } else {
-            println!("good");
-        }
-    }
-
-    #[test]
-    fn test_hinted_scalar_mul_by_constant_g1_affine() {
-        let k = 0;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-        let mut assigner = DummyAssinger::default();
-
-        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
-
-        let mut bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        let q = bases[0].mul(scalars[0]).into_affine();
-        println!("debug: expected res:{:?}", q);
-        let (inner_coeffs, _) = prepare_msm_input(&bases, &scalars, 12);
-
-        let mut scalar_type = FrType::new(&mut assigner, "init");
-        scalar_type.fill_with_data(crate::chunker::elements::DataType::FrData(scalars[0]));
-
-        let (segments, _) = chunk_hinted_scalar_mul_by_constant(
-            &mut assigner,
-            "g1_mul",
-            scalars[0],
-            scalar_type,
-            &mut bases[0],
-            inner_coeffs[0].0.clone(),
-            inner_coeffs[0].1.clone(),
-            inner_coeffs[0].2.clone(),
-        );
-
-        println!("segments count: {}", segments.len());
-
-        for segment in segments.iter() {
-            let witness = segment.witness(&assigner);
-            let script = segment.script(&assigner);
-
-            let mut lenw = 0;
-            for w in witness.iter() {
-                lenw += w.len();
-            }
-            assert!(
-                script.len() + lenw < 4000000,
-                "script and witness len is over 4M {} in {}",
-                script.len() + lenw,
-                segment.name
-            );
-
-            let res = execute_script_with_inputs(script, witness);
-            let zero: Vec<u8> = vec![];
-            assert_eq!(res.final_stack.len(), 1, "{}", segment.name); // only one element left
-            assert_eq!(res.final_stack.get(0), zero, "{}", segment.name);
-            assert!(
-                res.stats.max_nb_stack_items < 1000,
-                "stack limit exceeded {} in {}",
-                res.stats.max_nb_stack_items,
-                segment.name
-            );
-        }
-    }
-}
diff --git a/src/chunker/common.rs b/src/chunker/common.rs
deleted file mode 100644
index 52d8ab97d..000000000
--- a/src/chunker/common.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use bitcoin::script::write_scriptint;
-
-use crate::{treepp::*, ExecuteInfo};
-
-/// Define Witness
-pub type RawWitness = Vec<Vec<u8>>;
-
-/// Should use u32 version's blake3 hash for fq element
-pub use crate::hash::blake3_u32::blake3_var_length;
-
-/// The depth of a blake3 hash, depending on the defination of `N_DIGEST_U32_LIMBS`
-pub(crate) const BLAKE3_HASH_LENGTH: usize =
-    crate::hash::blake3_u32::N_DIGEST_U32_LIMBS as usize * 4;
-pub type BLAKE3HASH = [u8; BLAKE3_HASH_LENGTH];
-
-/// Return witness size of bytes.
-pub fn witness_size(witness: &RawWitness) -> usize {
-    let mut sum = 0;
-    for x in witness {
-        sum += x.len();
-    }
-    sum
-}
-
-/// 1 means not equal, 0 means equal.
-/// If n is non 0, compare two element of n length is equal or not and left 0 or 1 on stack.
-/// If n is 0, return 0.
-pub fn not_equal(n: usize) -> Script {
-    if n == 0 {
-        return script! {OP_FALSE};
-    }
-
-    script!(
-        for i in 0..n {
-            {i + n}
-            OP_PICK
-            {i + 1}
-            OP_PICK
-            OP_EQUAL
-            OP_TOALTSTACK
-        }
-
-        for _ in 0..2*n {
-            OP_DROP
-        }
-
-        OP_FROMALTSTACK
-
-        for _ in 0..n-1 {
-            OP_FROMALTSTACK
-            OP_BOOLAND
-        }
-
-        OP_NOT
-    )
-}
-
-/// From witness to hash
-pub fn witness_to_array(witness: RawWitness) -> BLAKE3HASH {
-    assert_eq!(witness.len(), BLAKE3_HASH_LENGTH);
-    let mut res: BLAKE3HASH = [0; BLAKE3_HASH_LENGTH];
-    for (idx, byte) in witness.iter().enumerate() {
-        if byte.is_empty() {
-            res[idx] = 0;
-        } else {
-            res[idx] = byte[0];
-        }
-    }
-    res
-}
-
-/// From hash to witness
-pub fn array_to_witness(hash: BLAKE3HASH) -> RawWitness {
-    let mut witness = vec![];
-    for byte in hash {
-        let mut out: [u8; 8] = [0; 8];
-        let length = write_scriptint(&mut out, byte as i64);
-        witness.push(out[0..length].to_vec());
-    }
-    witness
-}
-
-/// Extract witness from stack.
-pub fn extract_witness_from_stack(res: ExecuteInfo) -> RawWitness {
-    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
-        }
-    )
-}
diff --git a/src/chunker/disprove_execution.rs b/src/chunker/disprove_execution.rs
deleted file mode 100644
index 1ee7db493..000000000
--- a/src/chunker/disprove_execution.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-use super::{
-    assigner::BCAssigner, chunk_groth16_verifier::groth16_verify_to_segments, common::RawWitness,
-    elements::dummy_element,
-};
-use crate::groth16::{constants::LAMBDA, offchain_checker::compute_c_wi};
-use ark_bn254::{Bn254, G1Projective};
-use ark_ec::pairing::Pairing;
-use ark_ec::pairing::Pairing as ark_Pairing;
-use ark_ec::{pairing::Pairing as _, AffineRepr as _, CurveGroup as _, VariableBaseMSM as _};
-use ark_ff::Field as _;
-use ark_groth16::{Proof, VerifyingKey};
-use std::ops::Neg;
-use std::rc::Rc;
-
-#[derive(Clone)]
-pub struct RawProof {
-    pub proof: Proof<ark_bn254::Bn254>,
-    pub public: Vec<<ark_bn254::Bn254 as ark_ec::pairing::Pairing>::ScalarField>,
-    pub vk: VerifyingKey<ark_bn254::Bn254>,
-}
-
-impl RawProof {
-    pub fn valid_proof(&self) -> bool {
-        let scalars = [
-            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-            self.public.clone(),
-        ]
-        .concat();
-        let msm_g1 =
-            G1Projective::msm(&self.vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-        let (p1, p2, p3, p4) = (
-            msm_g1.into_affine(),
-            self.proof.c,
-            self.vk.alpha_g1,
-            self.proof.a,
-        );
-        let (q1, q2, q3, q4) = (
-            self.vk.gamma_g2.into_group().neg().into_affine(),
-            self.vk.delta_g2.into_group().neg().into_affine(),
-            -self.vk.beta_g2,
-            self.proof.b,
-        );
-        let t4 = q4;
-
-        // hint from arkworks
-        let mut f: ark_ff::QuadExtField<ark_ff::Fp12ConfigWrapper<ark_bn254::Fq12Config>> =
-            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 exp = &*LAMBDA;
-        f = f * wi * (c_inv.pow((exp).to_u64_digits()));
-        if f == ark_ff::QuadExtField::ONE {
-            return true;
-        }
-        return false;
-    }
-}
-
-pub fn disprove_exec<A: BCAssigner>(
-    assigner: &mut A,
-    assert_witness: Vec<Vec<RawWitness>>,
-    wrong_proof: RawProof,
-) -> Option<(usize, RawWitness)> {
-    // 0. if 'wrong_proof' is correct, return none
-    if wrong_proof.valid_proof() {
-        return None;
-    }
-
-    // 1. derive assigner from wrong proof
-    let mut wrong_proof_assigner = A::default();
-    let mut segments = groth16_verify_to_segments(
-        &mut wrong_proof_assigner,
-        &wrong_proof.public,
-        &wrong_proof.proof,
-        &wrong_proof.vk,
-    );
-    let segment_length = segments.len();
-
-    // 2. recover assigner from witness
-    let hash_map = assigner.recover_from_witness(assert_witness);
-
-    // 3. find which chunk is unconsistent
-    for (idx, segment) in segments.iter_mut().enumerate() {
-        let mut is_param_equal = true;
-        for param in segment.parameter_list.iter() {
-            if param.to_hash().unwrap() != hash_map.get(param.id()).unwrap().clone() {
-                is_param_equal = false;
-            }
-        }
-        let mut is_result_equal = true;
-        for result in segment.result_list.iter_mut() {
-            if result.to_hash().unwrap() != hash_map.get(result.id()).unwrap().clone() {
-                is_result_equal = false;
-                // replace the result to hash_map
-                *result = Rc::new(Box::new(dummy_element(
-                    &result.id(),
-                    hash_map.get(result.id()).unwrap().clone(),
-                )));
-            }
-        }
-
-        if is_param_equal && !is_result_equal {
-            let disprove_witness = segment.witness(assigner);
-            return Some((idx, disprove_witness));
-        }
-    }
-
-    // if all intermediate values is identical, then return the final chunk
-    for (idx, segment) in segments.iter().enumerate() {
-        if segment.is_final() {
-            let disprove_witness = segment.witness(assigner);
-            return Some((idx, disprove_witness));
-        }
-    }
-
-    println!("Shouldn't happend, some chunk must can be available with a wrong proof");
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::bridge::transactions::disprove;
-    use crate::chunker::assigner::*;
-    use crate::chunker::chunk_groth16_verifier::groth16_verify_to_segments;
-    use crate::chunker::disprove_execution::RawProof;
-    use crate::chunker::elements::Fq12Type;
-    use crate::chunker::{common::*, elements::ElementTrait};
-    use crate::execute_script_with_inputs;
-    use crate::treepp::*;
-
-    use ark_bn254::g1::G1Affine;
-    use ark_bn254::{Bn254, Fq12};
-    use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
-    use ark_ec::pairing::Pairing;
-    use ark_ff::{Field, PrimeField};
-    use ark_groth16::Groth16;
-    use ark_groth16::{ProvingKey, VerifyingKey};
-    use ark_relations::lc;
-    use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
-    use ark_std::{test_rng, UniformRand};
-    use bitcoin::hashes::{sha256::Hash as Sha256, Hash};
-    use rand::{RngCore, SeedableRng};
-    use std::collections::{BTreeMap, HashMap};
-    use std::process::id;
-    use std::rc::Rc;
-
-    use super::disprove_exec;
-
-    #[derive(Copy)]
-    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(())
-        }
-    }
-
-    fn gen_right_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 mut proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
-
-        RawProof {
-            proof: proof,
-            public: vec![c],
-            vk: vk,
-        }
-    }
-
-    /// test wrong proof, doesn't modify any intermediate value
-    /// diprove exec will return the final chunk
-    #[test]
-    fn test_wrong_proof() {
-        let mut right_proof = gen_right_proof();
-
-        // make it wrong
-        let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
-        right_proof.proof.a = G1Affine::rand(&mut rng);
-        let wrong_proof = right_proof;
-
-        // assert witness
-        let mut assigner = DummyAssinger::default();
-        let segments = groth16_verify_to_segments(
-            &mut assigner,
-            &wrong_proof.public,
-            &wrong_proof.proof,
-            &wrong_proof.vk,
-        );
-
-        println!("segments length: {}", segments.len());
-
-        // get all elements
-        let mut elements: BTreeMap<String, std::rc::Rc<Box<dyn ElementTrait>>> = BTreeMap::new();
-        for segment in segments.iter() {
-            for parameter in segment.parameter_list.iter() {
-                elements.insert(parameter.id().to_owned(), parameter.clone());
-            }
-            for result in segment.result_list.iter() {
-                elements.insert(result.id().to_owned(), result.clone());
-            }
-        }
-
-        // get all witnesses
-        let assert_witnesses = assigner.all_intermediate_witnesses(elements);
-
-        // must find some avalible chunk
-        let (id, witness) = disprove_exec(&mut assigner, assert_witnesses, wrong_proof).unwrap();
-
-        // println!("segment: {:?}", segments[id].parameter_list);
-        let script = segments[id].script(&assigner);
-        let res = execute_script_with_inputs(script, witness);
-        assert!(res.success, "{:?}, {:?}", res.error, res.final_stack);
-    }
-
-    /// test wrong proof and modify some intermediate value
-    /// diprove exec will return the final chunk
-    #[test]
-    fn test_wrong_proof_and_modify_intermediates() {
-        let mut right_proof = gen_right_proof();
-
-        // make it wrong
-        let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
-        right_proof.proof.a = G1Affine::rand(&mut rng);
-        let wrong_proof = right_proof;
-
-        // assert witness
-        let mut assigner = DummyAssinger::default();
-        let segments = groth16_verify_to_segments(
-            &mut assigner,
-            &wrong_proof.public,
-            &wrong_proof.proof,
-            &wrong_proof.vk,
-        );
-
-        println!("segments length: {}", segments.len());
-
-        // get all elements
-        let mut elements: BTreeMap<String, std::rc::Rc<Box<dyn ElementTrait>>> = BTreeMap::new();
-        for segment in segments.iter() {
-            for parameter in segment.parameter_list.iter() {
-                elements.insert(parameter.id().to_owned(), parameter.clone());
-            }
-            for result in segment.result_list.iter() {
-                elements.insert(result.id().to_owned(), result.clone());
-            }
-        }
-
-        // note: assume malicious operator modify some witnesses
-        let modify_id = "F_final_2p3c";
-        assert!(elements.contains_key(modify_id));
-        let mut new_element = Fq12Type::new(&mut assigner, modify_id);
-        new_element.fill_with_data(crate::chunker::elements::DataType::Fq12Data(Fq12::ONE));
-        elements.insert(modify_id.to_string(), Rc::new(Box::new(new_element)));
-
-        // get all witnesses
-        let assert_witnesses = assigner.all_intermediate_witnesses(elements);
-
-        // must find some avalible chunk
-        let (id, witness) = disprove_exec(&mut assigner, assert_witnesses, wrong_proof).unwrap();
-
-        // println!("segment: {:?}", segments[id].parameter_list);
-        let script = segments[id].script(&assigner);
-        let res = execute_script_with_inputs(script, witness);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn offchain_check_wrong_proof() {
-        let mut right_proof = gen_right_proof();
-        assert_eq!(right_proof.valid_proof(), true);
-
-        // make it wrong
-        let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
-        right_proof.proof.a = G1Affine::rand(&mut rng);
-        let wrong_proof = right_proof;
-
-        assert_eq!(wrong_proof.valid_proof(), false);
-    }
-}
diff --git a/src/chunker/elements.rs b/src/chunker/elements.rs
deleted file mode 100644
index cfd54dea5..000000000
--- a/src/chunker/elements.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use super::common::*;
-use crate::bn254::curves::{G1Affine, G2Affine};
-use crate::bn254::utils::{
-    fq12_push_not_montgomery, fq2_push_not_montgomery, fq6_push_not_montgomery,
-    fq_push_not_montgomery, fr_push_not_montgomery,
-};
-use crate::treepp::*;
-use crate::{chunker::assigner::BCAssigner, execute_script_with_inputs};
-use std::any::Any;
-use std::fmt::Debug;
-
-/// FqElements are used in the chunker, representing muliple Fq.
-#[derive(Debug, Clone)]
-pub struct FqElement {
-    pub identity: String,
-    pub size: usize,
-    pub witness_data: Option<RawWitness>,
-    pub data: Option<DataType>,
-}
-
-/// Achieve witness depth, `9` is the witness depth of `U254`
-impl FqElement {
-    fn witness_size(&self) -> usize {
-        self.size * 9
-    }
-}
-
-/// Define all data types
-#[derive(Debug, Clone)]
-pub enum DataType {
-    FqData(ark_bn254::Fq),
-    FrData(ark_bn254::Fr),
-    Fq2Data(ark_bn254::Fq2),
-    Fq6Data(ark_bn254::Fq6),
-    Fq12Data(ark_bn254::Fq12),
-    G1PointData(ark_bn254::G1Affine),
-    G2PointData(ark_bn254::G2Affine),
-}
-
-/// This trait defines the intermediate values
-pub trait ElementTrait: Debug {
-    /// Fill data by a specific value
-    fn fill_with_data(&mut self, x: DataType);
-    /// Convert the intermediate values to witness
-    fn to_witness(&self) -> Option<RawWitness>;
-    /// Convert the intermediate values from witness.
-    /// If witness is none, return none.
-    fn to_data(&self) -> Option<DataType>;
-    /// Hash witness by blake3, return Hash
-    fn to_hash(&self) -> Option<BLAKE3HASH>;
-    /// Hash witness by blake3, return witness of Hash
-    fn to_hash_witness(&self) -> Option<RawWitness>;
-    /// Size of element by Fq
-    fn size(&self) -> usize;
-    /// Witness size of element by u32
-    fn witness_size(&self) -> usize;
-    /// Return the name of identity.
-    fn id(&self) -> &str;
-}
-
-macro_rules! impl_element_trait {
-    ($element_type:ident, $data_type:ident, $size:expr, $push_method:expr) => {
-        #[derive(Clone, Debug)]
-        pub struct $element_type(FqElement);
-
-        impl $element_type {
-            /// Create a new element by using bitcommitment assigner
-            pub fn new<F: BCAssigner>(assigner: &mut F, id: &str) -> Self {
-                assigner.create_hash(id);
-                Self {
-                    0: FqElement {
-                        identity: id.to_owned(),
-                        size: $size,
-                        witness_data: None,
-                        data: None,
-                    },
-                }
-            }
-
-            pub fn new_dummy(id: &str) -> Self {
-                Self {
-                    0: FqElement {
-                        identity: id.to_owned(),
-                        size: $size,
-                        witness_data: None,
-                        data: None,
-                    },
-                }
-            }
-        }
-
-        /// impl element for Fq6
-        impl ElementTrait for $element_type {
-            fn fill_with_data(&mut self, x: DataType) {
-                match x {
-                    DataType::$data_type(fq6_data) => {
-                        let res = execute_script(script! {
-                            {$push_method(fq6_data)}
-                        });
-                        let witness = extract_witness_from_stack(res);
-                        assert_eq!(witness.len(), self.0.witness_size());
-
-                        self.0.witness_data = Some(witness);
-                        self.0.data = Some(x)
-                    }
-                    _ => panic!("fill wrong data {:?}", x.type_id()),
-                }
-            }
-
-            fn to_witness(&self) -> Option<RawWitness> {
-                self.0.witness_data.clone()
-            }
-
-            fn to_data(&self) -> Option<DataType> {
-                self.0.data.clone()
-            }
-
-            fn to_hash(&self) -> Option<BLAKE3HASH> {
-                match self.0.witness_data.clone() {
-                    None => None,
-                    Some(witness) => {
-                        let res = execute_script_with_inputs(
-                            script! {
-                                {blake3_var_length(self.0.witness_size())}
-                            },
-                            witness,
-                        );
-                        let hash = witness_to_array(extract_witness_from_stack(res));
-                        Some(hash)
-                    }
-                }
-            }
-
-            fn to_hash_witness(&self) -> Option<RawWitness> {
-                match self.0.witness_data.clone() {
-                    None => None,
-                    Some(witness) => {
-                        let res = execute_script_with_inputs(
-                            script! {
-                                {blake3_var_length(self.0.witness_size())}
-                            },
-                            witness,
-                        );
-                        let witness = extract_witness_from_stack(res);
-                        Some(witness)
-                    }
-                }
-            }
-
-            fn size(&self) -> usize {
-                self.0.size
-            }
-
-            fn witness_size(&self) -> usize {
-                self.0.witness_size()
-            }
-
-            fn id(&self) -> &str {
-                &self.0.identity
-            }
-        }
-    };
-}
-
-// (Fq)
-impl_element_trait!(FqType, FqData, 1, fq_push_not_montgomery);
-// (Fr)
-impl_element_trait!(FrType, FrData, 1, fr_push_not_montgomery);
-// (Fq2)
-impl_element_trait!(Fq2Type, Fq2Data, 2, fq2_push_not_montgomery);
-// (Fq6)
-impl_element_trait!(Fq6Type, Fq6Data, 6, fq6_push_not_montgomery);
-// (Fq12)
-impl_element_trait!(Fq12Type, Fq12Data, 12, fq12_push_not_montgomery);
-// (x: Fq, y: Fq)
-impl_element_trait!(G1PointType, G1PointData, 2, G1Affine::push_not_montgomery);
-// (x: Fq, y: Fq2)
-impl_element_trait!(G2PointType, G2PointData, 4, G2Affine::push_not_montgomery);
-
-#[derive(Debug, Clone)]
-pub struct DummyElement {
-    id: String,
-    hash: BLAKE3HASH,
-}
-
-impl ElementTrait for DummyElement {
-    fn fill_with_data(&mut self, _: DataType) {}
-
-    fn to_witness(&self) -> Option<RawWitness> {
-        None
-    }
-
-    fn to_data(&self) -> Option<DataType> {
-        None
-    }
-
-    fn to_hash(&self) -> Option<BLAKE3HASH> {
-        Some(self.hash)
-    }
-
-    fn to_hash_witness(&self) -> Option<RawWitness> {
-        Some(array_to_witness(self.hash))
-    }
-
-    fn size(&self) -> usize {
-        0
-    }
-
-    fn witness_size(&self) -> usize {
-        0
-    }
-
-    fn id(&self) -> &str {
-        &self.id
-    }
-}
-
-pub fn dummy_element(id: &str, hash: BLAKE3HASH) -> DummyElement {
-    DummyElement {
-        id: id.to_owned(),
-        hash,
-    }
-}
diff --git a/src/chunker/mod.rs b/src/chunker/mod.rs
deleted file mode 100644
index 94d0b4899..000000000
--- a/src/chunker/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub mod assigner;
-pub mod chunk_accumulator;
-pub mod chunk_evaluate_line;
-pub mod chunk_fq12_multiplication;
-pub mod chunk_g1_points;
-pub mod chunk_groth16_verifier;
-pub mod chunk_hinted_accumulator;
-pub mod chunk_msm;
-pub mod chunk_non_fixed_point;
-pub mod chunk_scalar_mul;
-pub mod common;
-pub mod disprove_execution;
-pub mod elements;
-pub mod segment;
diff --git a/src/chunker/segment.rs b/src/chunker/segment.rs
deleted file mode 100644
index 3326d3a3a..000000000
--- a/src/chunker/segment.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use super::assigner::BCAssigner;
-use super::common;
-use super::common::*;
-use super::elements::ElementTrait;
-use crate::bn254::utils::Hint;
-use crate::execute_script;
-use crate::treepp::*;
-use std::rc::Rc;
-
-/// Each segment is a branch in the taproot of disprove transaction.
-#[derive(Debug)]
-pub struct Segment {
-    pub name: String,
-    pub script: Script,
-    pub parameter_list: Vec<Rc<Box<dyn ElementTrait>>>,
-    pub result_list: Vec<Rc<Box<dyn ElementTrait>>>,
-    pub hints: Vec<Hint>,
-    pub final_segment: 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.
-impl Segment {
-    fn hinted_to_witness(&self) -> Vec<Vec<u8>> {
-        let res = execute_script(script! {
-            for hint in self.hints.iter() {
-                { hint.push() }
-            }
-        });
-        res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
-            vector.push(x);
-            vector
-        })
-    }
-
-    pub fn new(script: Script) -> Self {
-        Self::new_with_name(String::new(), script)
-    }
-
-    pub fn new_with_name(name: String, script: Script) -> Self {
-        Self {
-            name,
-            script,
-            parameter_list: vec![],
-            result_list: vec![],
-            hints: vec![],
-            final_segment: false,
-        }
-    }
-
-    pub fn add_parameter<T: ElementTrait + 'static + Clone>(mut self, x: &T) -> Self {
-        self.parameter_list.push(Rc::new(Box::new(x.clone())));
-        self
-    }
-
-    pub fn add_result<T: ElementTrait + 'static + Clone>(mut self, x: &T) -> Self {
-        self.result_list.push(Rc::new(Box::new(x.clone())));
-        self
-    }
-
-    pub fn add_hint(mut self, hints: Vec<Hint>) -> Self {
-        self.hints = hints;
-        self
-    }
-
-    pub fn mark_final(mut self) -> Self {
-        self.final_segment = true;
-        self
-    }
-
-    pub fn is_final(&self) -> bool {
-        self.final_segment
-    }
-
-    /// Create script, and the coressponding witness hopes to be like below.
-    /// [hinted, input0, input1, input1_bc_witness, input0_bc_witness, outpu0_bc_witness, output1_bc_witness]
-    pub fn script<T: BCAssigner>(&self, assigner: &T) -> Script {
-        let mut base: usize = 0;
-        let mut script = script! {
-
-            // 1. unlock all bitcommitment
-            for result in self.result_list.iter().rev() {
-                {assigner.locking_script(result)}
-                for _ in 0..BLAKE3_HASH_LENGTH {
-                    OP_TOALTSTACK
-                }
-            }
-            for parameter in self.parameter_list.iter() {
-                {assigner.locking_script(parameter)} // verify bit commitment
-                for _ in 0..BLAKE3_HASH_LENGTH {
-                    OP_TOALTSTACK
-                }
-            }
-        };
-
-        for parameter in self.parameter_list.iter().rev() {
-            let parameter_length = parameter.as_ref().witness_size();
-            script = script.push_script(
-                script! {
-                // 2. push parameters onto altstack
-                    for _ in 0..parameter_length {
-                        {base + parameter_length - 1} OP_PICK
-                    }
-                    {blake3_var_length(parameter_length)}
-                    for _ in 0..BLAKE3_HASH_LENGTH {
-                        OP_FROMALTSTACK
-                    }
-                    {equalverify(BLAKE3_HASH_LENGTH)}
-                }
-                .compile(),
-            );
-            base += parameter_length;
-        }
-
-        script = script.push_script(
-            script! {
-
-                // 3. run inner script
-                {self.script.clone()}
-
-                // 4. result of blake3
-                for result in self.result_list.iter().rev() {
-                    {blake3_var_length(result.as_ref().witness_size())}
-                    for _ in 0..BLAKE3_HASH_LENGTH {
-                        OP_TOALTSTACK
-                    }
-                }
-
-                for _ in 0..BLAKE3_HASH_LENGTH * self.result_list.len() * 2 {
-                    OP_FROMALTSTACK
-                }
-            }
-            .compile(),
-        );
-
-        if !self.final_segment {
-            script = script.push_script(
-                script! {
-                // 5. compare the result with assigned value
-                {common::not_equal(BLAKE3_HASH_LENGTH * self.result_list.len())}
-                }
-                .compile(),
-            );
-        }
-        script
-    }
-
-    /// Create witness.
-    pub fn witness<T: BCAssigner>(&self, assigner: &T) -> RawWitness {
-        // [hinted, input0, input1, input1_bc_witness, input0_bc_witness, output1_bc_witness, outpu0_bc_witness]
-        let mut witness = vec![];
-
-        witness.append(&mut self.hinted_to_witness());
-
-        for parameter in self.parameter_list.iter() {
-            match parameter.as_ref().to_witness() {
-                Some(mut w) => {
-                    witness.append(&mut w);
-                }
-                None => {
-                    panic!("extract witness {} fail in {}", parameter.id(), self.name)
-                }
-            }
-        }
-
-        for parameter in self.parameter_list.iter().rev() {
-            witness.append(&mut assigner.get_witness(parameter));
-        }
-
-        for result in self.result_list.iter() {
-            witness.append(&mut assigner.get_witness(result))
-        }
-
-        witness
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Segment;
-    use crate::chunker::elements::ElementTrait;
-    use crate::chunker::{assigner::DummyAssinger, elements::DataType::Fq6Data, elements::Fq6Type};
-    use crate::{execute_script_with_inputs, treepp::*};
-
-    #[test]
-    fn test_segment_by_simple_case() {
-        let mut assigner = DummyAssinger::default();
-
-        let mut a0 = Fq6Type::new(&mut assigner, "a0");
-        a0.fill_with_data(Fq6Data(ark_bn254::Fq6::from(1)));
-
-        let segment = Segment::new(script! {}).add_parameter(&a0).add_result(&a0);
-
-        let script = segment.script(&assigner);
-        let witness = segment.witness(&assigner);
-
-        println!("witnesss needs stack {}", witness.len());
-        println!(
-            "element witnesss needs stack {}",
-            a0.to_hash_witness().unwrap().len()
-        );
-
-        let res = execute_script_with_inputs(script, witness);
-        println!("res.successs {}", res.success);
-        println!("res.stack len {}", res.final_stack.len());
-        println!("rse.remaining: {}", res.remaining_script);
-        println!("res: {:1000}", res);
-    }
-}
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 bbfe932ca..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::{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 eab420e5a..000000000
--- a/src/fflonk/verifier.rs
+++ /dev/null
@@ -1,2547 +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::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());
-        run(script);
-    }
-}
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 5964b4907..000000000
--- a/src/groth16/offchain_checker.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-#![allow(non_snake_case)]
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-
-use crate::chunker::disprove_execution::RawProof;
-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;
-
-#[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}
-        }
-    };
-}
-
-#[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) {
-    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 sure f is r-th residue
-    log_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
-    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);
-
-    // 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);
-
-    log_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();
-    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, k);
-    log_assert_ne!(c, ark_bn254::Fq12::ONE);
-    log_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/test.rs b/src/groth16/test.rs
deleted file mode 100644
index 5794525f4..000000000
--- a/src/groth16/test.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use crate::groth16::verifier::Verifier;
-use crate::{execute_script, execute_script_without_stack_limit};
-use ark_bn254::Bn254;
-use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
-use ark_ec::pairing::Pairing;
-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)]
-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(())
-    }
-}
-
-#[test]
-fn test_groth16_verifier_native() {
-    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 start = start_timer!(|| "collect_script");
-    let script = Verifier::verify_proof(&vec![c], &proof, &vk);
-    end_timer!(start);
-
-    println!("groth16::test_verify_proof = {} 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);
-}
-
-#[test]
-fn test_groth16_verifier_native_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::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,
-    };
-    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 start = start_timer!(|| "collect_script");
-    let script = Verifier::verify_proof(&vec![c], &proof, &vk);
-    end_timer!(start);
-
-    println!("groth16::test_verify_proof = {} 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);
-}
-
-#[test]
-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());
-    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 (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&vec![c], &proof, &vk);
-
-    println!(
-        "hinted_groth16_verifier: {:?} bytes",
-        hinted_groth16_verifier.len()
-    );
-
-    let start = start_timer!(|| "collect_script");
-    let script = script! {
-        for hint in hints {
-            { hint.push() }
-        }
-        { hinted_groth16_verifier }
-    };
-    end_timer!(start);
-
-    println!("groth16::test_hinted_verify_proof = {} 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);
-}
-
-#[test]
-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::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,
-    };
-    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 (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&vec![c], &proof, &vk);
-
-    println!(
-        "hinted_groth16_verifier: {:?} bytes",
-        hinted_groth16_verifier.len()
-    );
-
-    let start = start_timer!(|| "collect_script");
-    let script = script! {
-        for hint in hints {
-            { hint.push() }
-        }
-        { hinted_groth16_verifier }
-    };
-    end_timer!(start);
-
-    println!("groth16::test_hinted_verify_proof = {} 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);
-}
-
-#[test]
-fn test_groth16_verifier() {
-    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 start = start_timer!(|| "collect_script");
-    let script = Verifier::verify_proof(&vec![c], &proof, &vk);
-    end_timer!(start);
-
-    println!("groth16::test_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(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 c50ecb5d4..000000000
--- a/src/groth16/verifier.rs
+++ /dev/null
@@ -1,313 +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::{
-    hinted_msm_with_constant_bases_affine,
-    msm_with_constant_bases_affine,
-};
-use crate::bn254::pairing::Pairing;
-use crate::bn254::utils::{
-    fq12_push, fq12_push_not_montgomery, fq2_push, fq2_push_not_montgomery, from_eval_point,
-    hinted_from_eval_point, Hint,
-};
-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_affine(&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
-            { from_eval_point(p2) }
-            { from_eval_point(p3) }
-            { 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
-            { check_pairing(&q_prepared, hint) }
-        }
-    }
-
-    pub fn hinted_verify(
-        public_inputs: &Vec<<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.clone(),
-        ]
-        .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);
-
-        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 = [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_lines = [
-            // constants
-            constants_not_montgomery(),
-            // 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
-            hinted_script3, // utils::from_eval_point(p2),
-            hinted_script4, // utils::from_eval_point(p3),
-            hinted_script5, // utils::from_eval_point(p4),
-            // the only non-fixed G2 point, say q4
-            fq2_push_not_montgomery(q4.x),
-            fq2_push_not_montgomery(q4.y),
-            // proofs for verifying final exp
-            fq12_push_not_montgomery(c),
-            fq12_push_not_montgomery(c_inv),
-            fq12_push_not_montgomery(wi),
-            // accumulator of q4, say t4
-            fq2_push_not_montgomery(t4.x),
-            fq2_push_not_montgomery(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_not_montgomery(ark_bn254::Fq12::ONE),
-            Fq12::equalverify(),
-            script! {OP_TRUE},
-        ];
-        let mut script = script! {};
-        for script_line in script_lines {
-            script = script.push_script(script_line.compile());
-        }
-
-        hints.extend(hint1);
-        hints.extend(hint2);
-        hints.extend(hint3);
-        hints.extend(hint4);
-        hints.extend(hint5);
-        hints.extend(hint6);
-
-        (script, hints)
-    }
-}
-
-// 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() }
-    }
-}
-
-// Push constants to stack
-// Return Stack: [beta_12, beta_13, beta_22, 1/2, B]
-fn constants_not_montgomery() -> Script {
-    script! {
-        // beta_12
-        { Fq::push_dec_not_montgomery("21575463638280843010398324269430826099269044274347216827212613867836435027261") }
-        { Fq::push_dec_not_montgomery("10307601595873709700152284273816112264069230130616436755625194854815875713954") }
-
-         // beta_13
-        { Fq::push_dec_not_montgomery("2821565182194536844548159561693502659359617185244120367078079554186484126554") }
-        { Fq::push_dec_not_montgomery("3505843767911556378687030309984248845540243509899259641013678093033130930403") }
-
-        // beta_22
-        { Fq::push_dec_not_montgomery("21888242871839275220042445260109153167277707414472061641714758635765020556616") }
-        { Fq::push_zero() }
-    }
-}
diff --git a/src/hash/blake3.rs b/src/hash/blake3.rs
deleted file mode 100644
index 17a3ae9b0..000000000
--- a/src/hash/blake3.rs
+++ /dev/null
@@ -1,671 +0,0 @@
-#![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};
-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() -> 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), i + 16 + 256 / 4);
-    }
-    env
-}
-
-pub fn ptr_init_160() -> 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
-        let value: i32 = i as i32
-            + 16
-            + 256 / 4
-            + match i < 10 {
-                true => 6,
-                false => -10,
-            };
-        env.insert(M(i), value as u32);
-    }
-    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<_>>()
-}
-
-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) -> 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..7] with states [8..15]
-        for i in 0..8{
-            {u32_xor(env.ptr(S(i)) + i, env.ptr_extract(S(i + 8)) + i, ap + 1)}
-        }
-    }
-}
-
-fn compress_160(env: &mut Env, ap: 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]
-        for i in 0..5{
-            {u32_xor(env.ptr(S(i)) + i, env.ptr_extract(S(i + 8)) + i, ap + 1)}
-        }
-    }
-}
-
-/// Blake3 taking a 64-byte message and returning a 32-byte digest
-pub fn blake3() -> Script {
-    let mut env = ptr_init();
-    script! {
-        // 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(64)}
-
-        // Perform a round of Blake3
-        {compress(&mut env, 16)}
-
-        // Save the hash
-        for _ in 0..8{
-            {u32_toaltstack()}
-        }
-
-        // Clean up the input data and the other half of the state
-        for _ in 0..24 {
-            {u32_drop()}
-        }
-
-        // Drop the lookup table
-        u8_drop_xor_table
-
-        // Load the hash
-        for _ in 0..8{
-            {u32_fromaltstack()}
-        }
-    }
-}
-
-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.");
-
-    // Compute how many padding elements are needed
-    let num_blocks = num_bytes.div_ceil(64);
-    let num_padding_bytes = num_blocks * 64 - num_bytes;
-
-    // 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();
-
-    // store the compression script for reuse
-    let compression_script = script! {
-        {compress(&mut env, 16)}
-
-        { 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()}
-        }
-    };
-
-    let script = script! {
-        // Add the padding
-        { push_to_stack(0, num_padding_bytes) }
-
-        // If padded, move all the bytes down
-        if num_padding_bytes != 0 {
-            for _ in 0..num_bytes {
-                { num_bytes + num_padding_bytes - 1 } OP_ROLL
-            }
-        }
-
-        // 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! {
-                            { 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
-        }
-    };
-
-    script.add_stack_hint(-(num_bytes as i32), 32i32 - num_bytes as i32)
-}
-
-/// Blake3 taking a 40-byte message and returning a 20-byte digest
-pub fn blake3_160() -> Script {
-    let mut env = ptr_init_160();
-    script! {
-        // Message zero-padding to 64-byte block
-        // for _ in 0..6{
-        //     {u32_push(0)}
-        // }
-        { push_to_stack(0,24) }
-
-        // 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(40)}
-
-        // Perform a round of Blake3
-        {compress_160(&mut env, 16)}
-
-        // Save the hash
-        for _ in 0..5{
-            {u32_toaltstack()}
-        }
-
-        // Clean up the input data and the other half of the state
-        for _ in 0..27{
-            {u32_drop()}
-        }
-
-        // Drop the lookup table
-        u8_drop_xor_table
-
-        // Load the hash
-        for _ in 0..5{
-            {u32_fromaltstack()}
-        }
-    }
-    .add_stack_hint(-40, -20)
-}
-
-pub fn blake3_160_var_length(num_bytes: usize) -> Script {
-    script! {
-        { blake3_var_length( num_bytes ) }
-        // Reduce the digest's length to 20 bytes
-        for _ in 0..6 {
-            OP_2DROP
-        }
-    }
-    .add_stack_hint(-(num_bytes as i32), 20i32 - num_bytes as i32)
-}
-
-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..28 {
-            OP_TOALTSTACK
-        }
-        {u32_equalverify()}
-        for _ in 0..7 {
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
-            {u32_equalverify()}
-        }
-    }
-}
-
-pub fn blake3_160_hash_equalverify() -> Script {
-    script! {
-        for _ in 0..16 {
-            OP_TOALTSTACK
-        }
-        {u32_equalverify()}
-        for _ in 0..4 {
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
-            {u32_equalverify()}
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use blake3::Hasher;
-    use hex::encode;
-
-    use crate::hash::blake3::*;
-    use crate::run;
-
-    use crate::treepp::{execute_script, script};
-
-    #[test]
-    fn test_permute() {
-        let mut env = ptr_init();
-        // 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 = "86ca95aefdee3d969af9bcc78b48a5c1115be5d66cafc2fc106bbd982d820e70";
-
-        let script = script! {
-            for _ in 0..16 {
-                {u32_push(1)}
-            }
-            blake3
-            {push_bytes_hex(hex_out)}
-            {blake3_hash_equalverify()}
-            OP_TRUE
-        };
-        let stack = script.clone().analyze_stack();
-        println!("stack: {:?}", stack);
-        run(script);
-    }
-
-    #[test]
-    fn test_blake3_var_length() {
-        // let hex_out = "11b4167bd0184b9fc8b3474a4c29d08e801cbc1596b63a5ab380ce0fc83a15cd";
-        let hex_out = "cfe4e91ae2dd3223f02e8c33d4ee464734d1620b64ed1f08cac7e21f204851b7";
-
-        let script = script! {
-            for _ in 0..32 {
-                {u32_push(1)}
-            }
-            { blake3_var_length(32*4) }
-            {push_bytes_hex(hex_out)}
-            {blake3_hash_equalverify()}
-            OP_TRUE
-        };
-        println!("Blake3_var_length_60 size: {:?} \n", script.len());
-
-        run(script);
-    }
-
-    #[test]
-    fn test_blake3_160() {
-        let hex_out = "290eef2c4633e64835e2ea6395e9fc3e8bf459a7";
-
-        let script = script! {
-            for _ in 0..10{
-                {u32_push(1)}
-            }
-            blake3_160
-            {push_bytes_hex(hex_out)}
-            blake3_160_hash_equalverify
-            OP_TRUE
-        };
-        println!("Blake3 size: {:?} \n", script.len());
-        run(script);
-    }
-
-    #[test]
-    fn test_blake3_160_var_length() {
-        let hex_out = "11b4167bd0184b9fc8b3474a4c29d08e801cbc15";
-
-        let script = script! {
-            for _ in 0..15 {
-                {u32_push(1)}
-            }
-            { blake3_160_var_length(60) }
-            { push_bytes_hex(hex_out) }
-            { blake3_160_hash_equalverify() }
-            OP_TRUE
-        };
-        println!("Blake3_160_var_length_60 size: {:?} \n", script.len());
-
-        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/src/hash/blake3_u32.rs b/src/hash/blake3_u32.rs
deleted file mode 100644
index 0598ed07b..000000000
--- a/src/hash/blake3_u32.rs
+++ /dev/null
@@ -1,809 +0,0 @@
-#![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<_>>()
-}
-
-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 i 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(|i| 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/src/hash/blake3_u4.rs b/src/hash/blake3_u4.rs
deleted file mode 100644
index aafdaccd4..000000000
--- a/src/hash/blake3_u4.rs
+++ /dev/null
@@ -1,925 +0,0 @@
-use std::collections::HashMap;
-
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
-
-pub use bitcoin_script::script;
-pub use bitcoin_script::builder::StructuredScript 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,
-    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_lookup(stack, -17) };
-        let xor_table = if !use_full_tables { u4_push_xor_table_stack(stack) } else { u4_push_xor_full_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);
-    }
-
-
-}
-
-
-pub fn right_rotate_xored(stack: &mut StackTracker, var_map: &mut HashMap<u8, StackVariable>, x:u8, y:u8, n: u8, use_full_tables: bool ) -> StackVariable {
-    let pos_shift = 8 - n / 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_2nib(stack, x, y, z, n, use_full_tables);
-    }
-
-    stack.join_count(&mut stack.get_var_from_stack(7), 7)
-
-}    
-
-pub fn xor_2nib_half(stack: &mut StackTracker, x: &mut StackVariable, y: StackVariable, nx: u8, ny: u8 )  -> StackVariable {
-
-    stack.op_depth();
-
-    stack.op_dup();
-
-    stack.copy_var_sub_n(y, ny as u32);
-    stack.move_var_sub_n(x, nx 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()
-}
-
-pub fn xor_2nib(stack: &mut StackTracker, x: &mut StackVariable, y: StackVariable, nx: u8, ny: u8, use_full_tables: bool )  -> StackVariable {
-    if !use_full_tables {
-        return xor_2nib_half(stack, x, y, nx, ny);
-    }
-
-    stack.op_depth();
-    stack.op_dup();
-
-    stack.copy_var_sub_n(y, ny as u32);
-
-    stack.op_sub();
-    stack.op_pick();
-
-    stack.op_add();
-
-    stack.move_var_sub_n(x, nx as u32);
-
-    stack.op_add();
-    stack.op_pick()
-}
-
-pub fn right_rotate7_xored_sub(
-    stack: &mut StackTracker,
-    x: &mut StackVariable,
-    y: StackVariable,
-    tables: &TablesVars,
-    n: u8,
-) {
-    stack.from_altstack();
-
-    let r0 = xor_2nib(stack, x, y, 0, n, tables.use_full_tables);
-
-    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
-
-    let z6 = xor_2nib(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_2nib(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 {
-        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 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() {
-
-        //copy the nibbles from the back
-        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");
-        }
-
-
-    }
-
-}
-
-
-pub fn g(
-    stack: &mut StackTracker,
-    var_map: &mut HashMap<u8, StackVariable>,
-    a: u8,
-    b: u8,
-    c: u8,
-    d: u8,
-    mut mx: StackVariable,
-    mut my: 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 mx], vec![], tables);
-    } else {
-        u4_add_direct(stack, 8, vec![vb, mx], 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 = right_rotate_xored(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 = right_rotate_xored(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 my], vec![], tables);
-    } else {
-        u4_add_direct(stack, 8, vec![vb, my], vec![&mut va], vec![], tables);
-    }
-
-    *va = stack.from_altstack_joined(8, &format!("state_{}", a));
-
-    let ret = right_rotate_xored(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 = 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,
-    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,
-    );
-}
-
-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, i == 6);
-
-        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();
-            let v1 = state.get_mut(&i).unwrap();
-            tmp.push(xor_2nib(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
-}
-
-// 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.div_ceil(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;
-
-    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);
-    }
-
-    for _ in original_message.iter() {
-        stack.to_altstack();
-    }
-
-
-    let tables = TablesVars::new(stack, use_full_tables);
-
-    for _ in original_message.iter() {
-        stack.from_altstack();
-    }
-
-
-    //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 tables
-    tables.drop(stack);
-
-    //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::{debugger::debug_script, script_util::verify_n, stack::StackTracker, optimizer::optimize};
-
-    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();
-        let optimized_start = optimize(stack.get_script().compile()).len();
-
-        blake3(&mut stack, 64, 8);
-        let end = stack.get_script().len();
-        println!("Blake3 size: {}", end - start);
-
-        let optimized_end = optimize(stack.get_script().compile()).len();
-        println!("Blake3 optimized size: {}", optimized_end - optimized_start);
-
-        stack.custom(
-            script! { {verify_blake3_hash(hex_out)}},
-            1,
-            false,
-            0,
-            "verify",
-        );
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-
-        //assert optimized version too
-        let optimized = optimize(stack.get_script().compile());
-        assert!(debug_script(optimized).0.result().unwrap().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();
-        let start_optimized = optimize(stack.get_script().compile()).len();
-        blake3(&mut stack, repeat * 4, 8);
-        let end = stack.get_script().len();
-        println!("Blake3 size: {} for: {} bytes", end - start, repeat * 4);
-
-        let end_optimized = optimize(stack.get_script().compile()).len();
-        println!("Blake3 optimized size: {} for: {} bytes", end_optimized - start_optimized, 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,
-            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/src/signatures/mod.rs b/src/signatures/mod.rs
deleted file mode 100644
index 98dc45140..000000000
--- a/src/signatures/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod winternitz;
-pub mod winternitz_hash;
-pub mod utils;
diff --git a/src/signatures/utils.rs b/src/signatures/utils.rs
deleted file mode 100644
index a6c67fb93..000000000
--- a/src/signatures/utils.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::treepp::*;
-
-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
-}
-
-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
-}
-
-//This function can change dramatically (for example it can be reversed, those kind of things can reduce the script size a lot but current optimizations are for the straightforward transformation)
-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 parameters"); 
-    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
-}
-
-pub fn bytes_to_number<const BYTE_COUNT: usize>() -> Script {
-    // Expects digits in order on stack in Little Endian (most significant bytes at top of stack, least significant bytes at bottom of stack)
-    script!{
-        for _ in 0..BYTE_COUNT - 1 {
-                OP_DUP OP_ADD
-            OP_ADD
-        }
-    }
-}
-
-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
-}
-
-
-pub(super) 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()
-}
-
-#[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/src/signatures/winternitz.rs b/src/signatures/winternitz.rs
deleted file mode 100644
index ab027edce..000000000
--- a/src/signatures/winternitz.rs
+++ /dev/null
@@ -1,843 +0,0 @@
-use super::utils::*;
-use crate::treepp::*;
-use bitcoin::{
-    hashes::{hash160, Hash},
-    Witness,
-};
-use serde::{Deserialize, Serialize};
-use std::{cmp::min, marker::PhantomData};
-
-type HashOut = [u8; 20];
-pub type PublicKey = Vec<HashOut>;
-pub type SecretKey = Vec<u8>;
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
-pub struct Parameters {
-    n0: u32,
-    log_d: u32,
-    n1: u32,
-    d: u32,
-    n: u32,
-}
-
-pub struct DigitSignature {
-    pub hash_bytes: Vec<u8>,
-    pub message_digit: u32,
-}
-
-impl Parameters {
-    pub const fn new(n0: u32, log_d: u32) -> Self {
-        assert!(
-            4 <= log_d && log_d <= 8,
-            "You can only choose block lengths in the range [4, 8]"
-        );
-        let d: u32 = (1 << log_d) - 1;
-        let n1: u32 = log_base_ceil(d * n0, d + 1) + 1;
-        let n: u32 = n0 + n1;
-        Parameters {
-            n0,
-            log_d,
-            n1,
-            d,
-            n,
-        }
-    }
-    fn byte_message_length(&self) -> u32 { (self.n0 * self.log_d + 7) / 8}
-    pub fn total_digit_count(&self) -> u32 { self.n }
-}
-
-fn public_key_for_digit(ps: &Parameters, secret_key: &SecretKey, digit_index: 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..ps.d {
-        hash = hash160::Hash::hash(&hash[..]);
-    }
-    *hash.as_byte_array()
-}
-
-pub fn digit_signature(
-    secret_key: &SecretKey,
-    digit_index: u32,
-    message_digit: u32,
-) -> DigitSignature {
-    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[..]);
-    }
-    let hash_bytes = hash.as_byte_array().to_vec();
-    DigitSignature {
-        hash_bytes,
-        message_digit,
-    }
-}
-
-pub fn generate_public_key(ps: &Parameters, secret_key: &SecretKey) -> PublicKey {
-    let mut public_key = PublicKey::new();
-    public_key.reserve(ps.n as usize);
-    for i in 0..ps.n {
-        public_key.push(public_key_for_digit(ps, secret_key, i));
-    }
-    public_key
-}
-
-fn checksum(ps: &Parameters, digits: Vec<u32>) -> u32 {
-    let mut sum = 0;
-    for digit in digits {
-        sum += digit;
-    }
-    ps.d * ps.n0 - sum
-}
-
-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.n1 as i32);
-    checksum_digits.append(&mut digits);
-    checksum_digits.reverse();
-    checksum_digits
-}
-/*
-    VERIFIER: These are signature verifiers
-        1)  ListpickVerifier:
-            Description: This generates hashes for each possible value and then uses OP_PICK
-            to get the corresponding one from the created list. Also as a small improvement, it
-            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: 2N + D/2
-
-        2)  BruteforceVerifier:
-            Description: This tries each possible value straightforwardly
-
-            Signature format: hash_{n - 1}, hash_{n - 2} ... hash_0 (Without digits)
-
-            Approximate Max Stack Depth: N
-
-        3)  BinarysearchVerifier:
-            Description: This 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: 2N
-
-        4)  HybridVerifier:
-            Descripton: This narrows the search space first by doing binary search, then uses a list for the remaning space
-            i.e. it uses Algorithm 3 and Algorithm 1 consequently
-
-            Signature format: hash_{n - 1}, digit_{n - 1}, hash_{n - 2}, digit_{n - 2} ... hash_0, digit_0 (With digits)
-
-            Approximate Max Stack Depth: 2N + REMAINING_SPACE_SIZE
-
-    CONVERTER: These are digits to bytes converters
-        1)  TabledConverter:
-            Descripton: This uses a table for the divison of 2
-
-            Approximate Max Stack Depth: N + D
-
-        2)  StraightforwardConverter:
-            Descripton: This just uses OP_IF's to decompose the numbers into bits
-
-            Approximate Max Stack Depth: N
-
-    Sample Usage:
-        Pick the algorithms you want to use, i.e. BinarysearchVerifier and StraightforwardConverter
-        Construct your struct: let o = Winternitz::<BinarysearchVerifier, StraightforwardConverter>::new();
-        Choose your n0 and log_d values for the calculation of other variables: let p = Parameters::new(n0, log_d);
-        Use the methods for the necessary operations, for example: o.sign(&p, ...), o.checksig_verify(&p, ...)
-*/
-
-pub trait Verifier {
-    // Default digit signatures
-    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.n {
-            let sig = digit_signature(secret_key, i, digits[i as usize]);
-            result.push(sig.hash_bytes);
-            result.push(u32_to_le_bytes_minimal(digits[i as usize]));
-        }
-        result
-    }
-}
-pub trait Converter {
-    fn get_script(ps: &Parameters) -> Script;
-}
-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()
-    }
-}
-
-impl<VERIFIER: Verifier, CONVERTER: Converter> Winternitz<VERIFIER, CONVERTER> {
-    pub const fn new() -> Self {
-        Winternitz {
-            phantom0: PhantomData,
-            phantom1: PhantomData,
-        }
-    }
-
-    pub fn sign_digits(
-        &self,
-        ps: &Parameters,
-        secret_key: &SecretKey,
-        digits: Vec<u32>,
-    ) -> Witness {
-        VERIFIER::sign_digits(ps, secret_key, digits)
-    }
-
-    pub fn sign(
-        &self,
-        ps: &Parameters,
-        secret_key: &SecretKey,
-        message_bytes: &Vec<u8>,
-    ) -> Witness {
-        VERIFIER::sign_digits(
-            ps,
-            secret_key,
-            bytes_to_u32s(ps.n0, ps.log_d, message_bytes),
-        )
-    }
-
-    fn verify_checksum(&self, ps: &Parameters) -> Script {
-        script! {
-            OP_FROMALTSTACK OP_DUP OP_NEGATE
-            for _ in 1..ps.n0 {
-                OP_FROMALTSTACK OP_TUCK OP_SUB
-            }
-            { ps.d * ps.n0 }
-            OP_ADD
-            OP_FROMALTSTACK
-            for _ in 0..ps.n1 - 1 {
-                for _ in 0..ps.log_d {
-                    OP_DUP OP_ADD
-                }
-                OP_FROMALTSTACK
-                OP_ADD
-            }
-            OP_EQUALVERIFY
-        }
-    }
-}
-
-pub struct ListpickVerifier {}
-impl Verifier for ListpickVerifier {}
-
-impl<CONVERTER: Converter> Winternitz<ListpickVerifier, CONVERTER> {
-    fn verify_digits(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        script! {
-            for digit_index in 0..ps.n {
-                // 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.n as usize - 1 - digit_index as usize]).to_vec() }
-                OP_EQUALVERIFY
-                for _ in 0..(ps.d + 1)/4 {
-                    OP_2DROP
-                }
-            }
-        }
-    }
-
-    pub fn checksig_verify(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        let mut script = self.verify_digits(ps, public_key);
-        script = script.push_script(self.verify_checksum(ps).compile());
-        script.push_script(CONVERTER::get_script(ps).compile())
-    }
-}
-
-pub struct BruteforceVerifier {}
-impl Verifier for BruteforceVerifier {
-    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.n {
-            let sig = digit_signature(secret_key, i, digits[i as usize]);
-            result.push(sig.hash_bytes);
-        }
-        result
-    }
-}
-
-impl<CONVERTER: Converter> Winternitz<BruteforceVerifier, CONVERTER> {
-    fn verify_digits(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        script! {
-            for digit_index in 0..ps.n {
-                { public_key[(ps.n - 1 - digit_index) as usize].to_vec() }
-                OP_SWAP
-                { -1 } OP_TOALTSTACK
-                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
-            }
-        }
-    }
-
-    pub fn checksig_verify(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        let mut script = self.verify_digits(ps, public_key);
-        script = script.push_script(self.verify_checksum(ps).compile());
-        script.push_script(CONVERTER::get_script(ps).compile())
-    }
-}
-
-pub struct BinarysearchVerifier {}
-impl Verifier for BinarysearchVerifier {}
-
-impl<CONVERTER: Converter> Winternitz<BinarysearchVerifier, CONVERTER> {
-    fn verify_digits(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        script! {
-            for digit_index in 0..ps.n {
-                //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.log_d).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.n - 1 - digit_index) as usize]).to_vec() }
-                OP_EQUALVERIFY
-            }
-        }
-    }
-
-    pub fn checksig_verify(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
-        let mut script = self.verify_digits(ps, public_key);
-        script = script.push_script(self.verify_checksum(ps).compile());
-        script.push_script(CONVERTER::get_script(ps).compile())
-    }
-}
-
-pub struct HybridVerifier {}
-impl Verifier for HybridVerifier {}
-
-impl<CONVERTER: Converter> Winternitz<HybridVerifier, CONVERTER> {
-    fn verify_digits(&self, ps: &Parameters, public_key: &PublicKey, block_log_d: u32) -> Script {
-        let block_d = (1 << block_log_d) - 1;
-        script! {
-            for digit_index in 0..ps.n {
-                { ps.d }
-                OP_MIN
-                OP_DUP
-                OP_TOALTSTACK
-                {ps.d} OP_SWAP OP_SUB
-                for bit in (block_log_d..ps.log_d).rev() {
-                    {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
-                }
-                {block_d} OP_SWAP OP_SUB //turn to positive form
-                OP_TOALTSTACK
-                for _ in 0..block_d {
-                    OP_DUP
-                    OP_HASH160
-                }
-                OP_FROMALTSTACK
-                OP_PICK
-                { (public_key[(ps.n - 1 - digit_index) as usize]).to_vec() }
-                OP_EQUALVERIFY
-                for _ in 0..((block_d + 1)/2) {
-                    OP_2DROP
-                }
-            }
-        }
-    }
-
-    pub fn checksig_verify(
-        &self,
-        ps: &Parameters,
-        public_key: &PublicKey,
-        block_log_d: u32,
-    ) -> Script {
-        assert!((1..ps.log_d).contains(&block_log_d));
-        let mut script = self.verify_digits(ps, public_key, block_log_d);
-        script = script.push_script(self.verify_checksum(ps).compile());
-        script.push_script(CONVERTER::get_script(ps).compile())
-    }
-}
-
-pub struct TabledConverter {}
-impl Converter for TabledConverter {
-    fn get_script(ps: &Parameters) -> Script {
-        let mut turning_into_bytes;
-        if ps.log_d == 8 {
-            //already bytes
-            turning_into_bytes = script! {};
-        } else if ps.log_d == 4 {
-            turning_into_bytes = script! {
-                for i in 0..ps.n0 / 2 {
-                    OP_SWAP
-                    for _ in 0..ps.log_d {
-                        OP_DUP OP_ADD
-                    }
-                    OP_ADD
-                    if i != (ps.n0/2) - 1 {
-                        OP_TOALTSTACK
-                    }
-                }
-                if ps.n0 > 1 {
-                    for _ in 0..ps.n0 / 2 - 1{
-                        OP_FROMALTSTACK
-                    }
-                }
-            };
-        } else {
-            turning_into_bytes = script! {
-                //create division by two table i.e. table(x) = floor(x/2)
-                {ps.d/2}
-                for _ in 1..(ps.d+1)/2 {
-                    OP_DUP OP_DUP
-                    OP_1SUB
-                }
-                OP_DUP
-            };
-            //convert
-            let mut current_byte_len = 0;
-            let mut script_lines = vec![];
-            script_lines.push(script! {
-                OP_0
-                OP_TOALTSTACK
-            });
-            for _ in 0..ps.n0 {
-                let mut left = ps.log_d;
-                script_lines.push(script! {
-                    {ps.d + 1} OP_ROLL
-                });
-                while left > 0 {
-                    if current_byte_len == 8 {
-                        current_byte_len = 0;
-                        script_lines.push(script! {
-                            OP_0
-                            OP_TOALTSTACK
-                        });
-                    }
-                    let take = min(left, 8 - current_byte_len);
-                    script_lines.push(script! {
-                        OP_DUP
-                        OP_TOALTSTACK
-                        for _ in 0..take {
-                            OP_PICK
-                        }
-                        OP_DUP
-                        for _ in 0..take {
-                            OP_DUP OP_ADD
-                        }
-                        OP_FROMALTSTACK
-                        OP_SWAP OP_SUB
-                        for _ in 0..current_byte_len {
-                            OP_DUP OP_ADD
-                        }
-                        OP_FROMALTSTACK
-                        OP_ADD
-                        OP_TOALTSTACK
-                    });
-                    current_byte_len += take;
-                    left -= take;
-                }
-                script_lines.push(script! {
-                    OP_DROP
-                });
-            }
-            //clear the table
-            script_lines.push(script! {
-                for _ in 0..(ps.d + 1)/2 {
-                    OP_2DROP
-                }
-                for _ in 0..ps.byte_message_length() {
-                    OP_FROMALTSTACK
-                }
-            });
-            for script_line in script_lines {
-                turning_into_bytes = turning_into_bytes.push_script(script_line.compile());
-            }
-        }
-        turning_into_bytes
-    }
-}
-
-pub struct StraightforwardConverter {}
-impl Converter for StraightforwardConverter {
-    fn get_script(ps: &Parameters) -> Script {
-        let mut turning_into_bytes = script! {};
-        if ps.log_d == 8 {
-            //already bytes
-            turning_into_bytes = script! {};
-        } else if ps.log_d == 4 {
-            turning_into_bytes = script! {
-                for i in 0..ps.n0 / 2 {
-                    OP_SWAP
-                    for _ in 0..ps.log_d {
-                        OP_DUP OP_ADD
-                    }
-                    OP_ADD
-                    if i != (ps.n0/2) - 1 {
-                        OP_TOALTSTACK
-                    }
-                }
-                if ps.n0 > 1 {
-                    for _ in 0..ps.n0 / 2 - 1{
-                        OP_FROMALTSTACK
-                    }
-                }
-            };
-        } else {
-            let mut lens: Vec<u32> = vec![];
-            let mut script_lines: Vec<Script> = vec![];
-            for i in 0..ps.n0 {
-                let start = i * ps.log_d;
-                let next_stop = start + 8 - (start % 8);
-                let split = next_stop - start;
-                if split >= ps.log_d {
-                    lens.push(ps.log_d);
-                    script_lines.push(script! {
-                        OP_TOALTSTACK
-                    });
-                } else {
-                    lens.push(split);
-                    lens.push(ps.log_d - split);
-                    script_lines.push(script! {
-                        OP_0
-                        for j in (split..ps.log_d).rev() {
-                            if j != ps.log_d - 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.n0 * ps.log_d % 8)) % 8;
-            let mut is_last_zero = true;
-            script_lines.push(script! {
-                OP_0
-            });
-            for i in 0..lens.len() {
-                let l = lens[i];
-                if last_bytes >= 8 {
-                    //assert!(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::Mutex;
-    lazy_static::lazy_static! {
-        static ref MALICIOUS_RNG: Mutex<ChaCha20Rng> = Mutex::new(ChaCha20Rng::seed_from_u64(337));
-    }
-
-    const SAMPLE_SECRET_KEY: &str = "b138982ce17ac813d505b5b40b665d404e9528e7";
-    const TEST_COUNT: u32 = 20;
-
-    //This test is not extensive and definitely misses corner cases, if there are any
-    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.n);
-        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.n0 * $ps.log_d,
-                $s.len() as f64 / ($ps.n0 * $ps.log_d) 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_regular_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 s = 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 N0:{} and LOG_D:{}  {} with {} =>", $ps.n0, $ps.log_d, get_type_name::<$verifier>(), get_type_name::<$converter>());
-                    test_script!($ps, s, $message_checker, $desired_outcome);
-                }
-            )*
-        };
-    }
-    macro_rules! generate_hybrid_winternitz_tests {
-        (
-            $ps:expr, $secret_key:expr, $public_key:expr, $message:expr, $message_checker:expr, $desired_outcome:expr;
-            $([$converter:ty]),*
-        ) => {
-            $(
-                {
-                    let o = Winternitz::<HybridVerifier, $converter>::new();
-                    for i in 1..$ps.log_d {
-                        let s = script! {
-                            { o.sign(&$ps, &$secret_key, &$message) }
-                            if $desired_outcome == false {
-                                { try_malicious(&$ps, &$message, &get_type_name::<HybridVerifier>()) }
-                           }
-                            { o.checksig_verify(&$ps, &$public_key, i) }
-                        };
-                        println!("For N0:{} and LOG_D:{}  {} with {} block_log_d:{} =>", $ps.n0, $ps.log_d, get_type_name::<HybridVerifier>(), get_type_name::<$converter>(), i);
-                        test_script!($ps, s, $message_checker, $desired_outcome);
-                    }
-                }
-            )*
-        };
-    }
-
-    #[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.n0 * ps.log_d / 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_regular_winternitz_tests!(
-                ps, secret_key, public_key, message, message_checker, true;
-                [ListpickVerifier, TabledConverter],
-                [ListpickVerifier, StraightforwardConverter],
-                [BruteforceVerifier, TabledConverter],
-                [BruteforceVerifier, StraightforwardConverter],
-                [BinarysearchVerifier, TabledConverter],
-                [BinarysearchVerifier, StraightforwardConverter]
-            );
-            generate_hybrid_winternitz_tests!(
-                ps, secret_key, public_key, message, message_checker, true;
-                [TabledConverter],
-                [StraightforwardConverter]
-            );
-        }
-    }
-
-    #[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.n0 * ps.log_d / 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_regular_winternitz_tests!(
-                ps, secret_key, public_key, message, message_checker, false;
-                [ListpickVerifier, TabledConverter],
-                [ListpickVerifier, StraightforwardConverter],
-                [BruteforceVerifier, TabledConverter],
-                [BruteforceVerifier, StraightforwardConverter],
-                [BinarysearchVerifier, TabledConverter],
-                [BinarysearchVerifier, StraightforwardConverter]
-            );
-            generate_hybrid_winternitz_tests!(
-                ps, secret_key, public_key, message, message_checker, false;
-                [TabledConverter],
-                [StraightforwardConverter]
-            );
-        }
-    }
-}
diff --git a/src/signatures/winternitz_hash.rs b/src/signatures/winternitz_hash.rs
deleted file mode 100644
index cd37f5f40..000000000
--- a/src/signatures/winternitz_hash.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-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;
-//These two are just added for compatibility, they can be changed and might not be the best choice of algorithms or parameters for your usage
-pub static WINTERNITZ_HASH_VERIFIER: Winternitz::<ListpickVerifier, StraightforwardConverter> = Winternitz::new();
-pub static WINTERNITZ_MESSAGE_VERIFIER: Winternitz::<ListpickVerifier, StraightforwardConverter> = Winternitz::new();
-pub static WINTERNITZ_HASH_PARAMETERS: Parameters = Parameters::new(MESSAGE_HASH_LEN * 2, 4);
-
-/// 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
-        { WINTERNITZ_HASH_VERIFIER.checksig_verify(&WINTERNITZ_HASH_PARAMETERS, 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: &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"),
-        };
-        
-        // My public key
-        let public_key = generate_public_key(&WINTERNITZ_HASH_PARAMETERS, &secret_key);
-
-        // The message to sign
-        let message = *b"This is an arbitrary length input intended for testing purposes....";
-
-
-        assert!(execute_script(script! {
-            //
-            // Unlocking Script
-            //
-
-            // 1. Push the message 
-            for byte in message.iter().rev() {
-                { *byte }
-            }
-            // 2. Push the signature
-            { sign_hash(&secret_key, &message) }
-            
-            
-            //
-            // Locking Script
-            //
-            { check_hash_sig(&public_key, message.len()) }
-            OP_TRUE
-        }).success);   
-    }
-
-}
diff --git a/src/u32/u32_add.rs b/src/u32/u32_add.rs
deleted file mode 100644
index bb8765c0e..000000000
--- a/src/u32/u32_add.rs
+++ /dev/null
@@ -1,129 +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::run;
-    use crate::treepp::script;
-    use crate::u32::u32_add::*;
-    use crate::u32::u32_std::u32_push;
-
-    #[test]
-    fn test_u32_add() {
-        println!("u32_len: {}", u32_add_drop(1,0).len());
-        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
-        };
-        run(script);
-    }
-}
diff --git a/src/u32/u32_or.rs b/src/u32/u32_or.rs
deleted file mode 100644
index d8678e395..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
-    }.add_stack_hint(-(i as i32 + 256), -1)
-}
-
-/// 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::run;
-    use crate::treepp::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
-            };
-            run(exec_script);
-        }
-    }
-}
diff --git a/src/u32/u32_rshift.rs b/src/u32/u32_rshift.rs
deleted file mode 100644
index 133b61feb..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)}
-    }.add_stack_hint(-4, 0)
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::run;
-    use crate::treepp::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 script = script! {
-                    {u32_push(x)}
-                    {u32_rshift(i)}
-                    {u32_push(rshift(x, i))}
-                    {u32_equal()}
-                };
-                run(script);
-            }
-        }
-    }
-}
diff --git a/src/u4/u4_add.rs b/src/u4/u4_add.rs
deleted file mode 100644
index 48e8937ac..000000000
--- a/src/u4/u4_add.rs
+++ /dev/null
@@ -1,646 +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_push_quotient_table_5() -> Script {
-    script! {
-        OP_4
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        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_push_modulo_table_5() -> 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_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_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 23bf90faa..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::u4::u4_shift_stack::u4_push_shift_tables_stack;
-    use crate::treepp::script;
-    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 506be8327..000000000
--- a/tests/bridge/assert/assert.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::base::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 config = setup_test().await;
-
-    let amount = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    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 tx = assert_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = config.client_0.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/chain/mod.rs b/tests/bridge/chain/mod.rs
deleted file mode 100644
index 5e9546c5b..000000000
--- a/tests/bridge/chain/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod chain;
-pub mod ethereum;
diff --git a/tests/bridge/client/musig2_peg_out.rs b/tests/bridge/client/musig2_peg_out.rs
deleted file mode 100644
index 0450d4b7e..000000000
--- a/tests/bridge/client/musig2_peg_out.rs
+++ /dev/null
@@ -1,425 +0,0 @@
-use std::time::Duration;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    client::{
-        chain::chain::{Chain, PegOutEvent},
-        client::BitVMClient,
-    },
-    contexts::{
-        depositor::DepositorContext, operator::OperatorContext, withdrawer::WithdrawerContext,
-    },
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
-    transactions::{
-        base::{Input, InputWithScript},
-        pre_signed::PreSignedTransaction,
-    },
-};
-use num_traits::ToPrimitive;
-use serial_test::serial;
-use tokio::time::sleep;
-
-use crate::bridge::{
-    faucet::Faucet,
-    helper::{find_peg_in_graph_by_peg_out, generate_stub_outpoint, TX_WAIT_TIME},
-    mock::chain::mock::MockAdaptor,
-    setup::setup_test,
-};
-
-#[tokio::test]
-#[serial]
-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]
-#[serial]
-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]
-#[serial]
-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]
-#[serial]
-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]
-#[serial]
-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]
-#[serial]
-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;
-}
-
-#[tokio::test]
-#[serial]
-async fn test_musig2_peg_out_peg_out() {
-    let (
-        mut depositor_operator_verifier_0_client,
-        _,
-        peg_out_graph_id,
-        _,
-        withdrawer_evm_address,
-        withdrawer_context,
-        operator_context,
-    ) = create_peg_out_graph(false, false, false).await;
-    depositor_operator_verifier_0_client.sync().await;
-    let peg_in_graph =
-        find_peg_in_graph_by_peg_out(&depositor_operator_verifier_0_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 mut mock_adaptor = MockAdaptor::new();
-    mock_adaptor.peg_out_init_events = 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,
-        withdrawer_public_key_hash: withdrawer_context.withdrawer_public_key.pubkey_hash(),
-        operator_public_key: operator_context.operator_public_key,
-        tx_hash: [0u8; 4].into(),
-    }];
-    let mut chain_adaptor = Chain::new();
-    chain_adaptor.init_default(Box::new(mock_adaptor));
-    depositor_operator_verifier_0_client.set_chain_adaptor(chain_adaptor);
-    depositor_operator_verifier_0_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();
-    faucet
-        .fund_input_and_wait(&operator_funding_utxo_address, peg_in_confirm_amount)
-        .await;
-    let operator_funding_outpoint = generate_stub_outpoint(
-        &depositor_operator_verifier_0_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,
-    };
-    eprintln!("Broadcasting peg out...");
-    depositor_operator_verifier_0_client
-        .broadcast_peg_out(&peg_out_graph_id, input)
-        .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,
-    String,
-    WithdrawerContext,
-    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 + FEE_AMOUNT);
-    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 + FEE_AMOUNT);
-    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 challenge_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        config.depositor_context.network,
-        &config.depositor_context.depositor_public_key,
-    );
-    if with_challenge_tx {
-        funding_inputs.push((&challenge_funding_utxo_address, challenge_input_amount));
-    }
-
-    let faucet = Faucet::new();
-    faucet
-        .verify_and_fund_inputs(&depositor_operator_verifier_0_client, &funding_inputs)
-        .await;
-    println!("Waiting for funding inputs tx...");
-    sleep(Duration::from_secs(TX_WAIT_TIME)).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,
-        &config.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(&config.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(&config.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;
-    }
-
-    (
-        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,
-    )
-}
-
-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;
-
-    graph_id
-}
diff --git a/tests/bridge/client/sync.rs b/tests/bridge/client/sync.rs
deleted file mode 100644
index 1d03c82e3..000000000
--- a/tests/bridge/client/sync.rs
+++ /dev/null
@@ -1,56 +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 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 + FEE_AMOUNT + 1);
-    let 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;
-
-    let peg_in_graph_id = config
-        .client_0
-        .create_peg_in_graph(Input { outpoint, amount }, &config.depositor_evm_address)
-        .await;
-
-    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,
-            },
-        )
-        .await;
-
-    println!("Save to remote");
-    config.client_0.flush().await;
-}
diff --git a/tests/bridge/disprove/disprove.rs b/tests/bridge/disprove/disprove.rs
deleted file mode 100644
index 65e8ecde2..000000000
--- a/tests/bridge/disprove/disprove.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-#[cfg(test)]
-mod tests {
-
-    use bitcoin::{
-        consensus::encode::serialize_hex, key::Keypair, Amount, Network, PrivateKey, PublicKey,
-        TxOut,
-    };
-
-    use bitvm::bridge::{
-        connectors::base::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 config = setup_test().await;
-
-        let amount_0 = Amount::from_sat(DUST_AMOUNT);
-        let outpoint_0 = generate_stub_outpoint(
-            &config.client_0,
-            &config.connector_c.generate_taproot_address(),
-            amount_0,
-        )
-        .await;
-
-        let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint_1 = generate_stub_outpoint(
-            &config.client_0,
-            &config.connector_c.generate_taproot_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,
-            },
-            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 tx = disprove_tx.finalize();
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-        let result = config.client_0.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 config = setup_test().await;
-
-        let amount_0 = Amount::from_sat(DUST_AMOUNT);
-        let outpoint_0 = generate_stub_outpoint(
-            &config.client_0,
-            &config.connector_c.generate_taproot_address(),
-            amount_0,
-        )
-        .await;
-
-        let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint_1 = generate_stub_outpoint(
-            &config.client_0,
-            &config.connector_c.generate_taproot_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,
-            },
-            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 mut tx = disprove_tx.finalize();
-
-        let secp = config.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 = config.client_0.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 4134e7ccf..000000000
--- a/tests/bridge/disprove_chain/disprove_chain.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-#[cfg(test)]
-mod tests {
-
-    use bitcoin::{
-        consensus::encode::serialize_hex, key::Keypair, Amount, PrivateKey, PublicKey, TxOut,
-    };
-
-    use bitvm::bridge::{
-        connectors::base::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 config = setup_test().await;
-
-        let amount = Amount::from_sat(INITIAL_AMOUNT);
-        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 tx = disprove_chain_tx.finalize();
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-
-        let result = config.client_0.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 config = setup_test().await;
-
-        let amount = Amount::from_sat(INITIAL_AMOUNT);
-        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 mut tx = disprove_chain_tx.finalize();
-
-        let secp = config.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(),
-            config.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 = config.client_0.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 00a12bbde..000000000
--- a/tests/bridge/helper.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use bitcoin::{Address, Amount, OutPoint};
-
-use bitvm::bridge::{
-    client::client::BitVMClient,
-    graphs::{base::BaseGraph, peg_in::PegInGraph, peg_out::PegOutGraph},
-};
-
-pub const TX_WAIT_TIME: u64 = 45; // in seconds
-pub const ESPLORA_FUNDING_URL: &str = "https://faucet.mutinynet.com/";
-pub const ESPLORA_RETRIES: usize = 3;
-pub const ESPLORA_RETRY_WAIT_TIME: u64 = 5;
-
-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(),
-                ESPLORA_FUNDING_URL,
-            );
-        });
-    OutPoint {
-        txid: funding_utxo.txid,
-        vout: funding_utxo.vout,
-    }
-}
-
-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(),
-            ESPLORA_FUNDING_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
-        .get_data()
-        .peg_in_graphs
-        .iter()
-        .find(|&graph| graph.id().eq(peg_in_graph_id));
-
-    peg_in_graph.map(|peg_in_graph| peg_in_graph.clone())
-}
-
-pub fn find_peg_out_graph(client: &BitVMClient, peg_out_graph_id: &str) -> Option<PegOutGraph> {
-    let peg_out_graph = client
-        .get_data()
-        .peg_out_graphs
-        .iter()
-        .find(|&graph| graph.id().eq(&peg_out_graph_id));
-
-    peg_out_graph.map(|peg_out_graph| peg_out_graph.clone())
-}
-
-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,
-    }
-}
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/peg_out/disprove.rs b/tests/bridge/integration/peg_out/disprove.rs
deleted file mode 100644
index f1df959e1..000000000
--- a/tests/bridge/integration/peg_out/disprove.rs
+++ /dev/null
@@ -1,150 +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 config = 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(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_2_funding_utxo_address, kick_off_2_input_amount));
-
-    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.commitment_secrets,
-        &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(
-        &config.connector_4,
-        &config.connector_5,
-        &config.connector_b,
-        &config.connector_c,
-        assert_input_0,
-    );
-
-    let secret_nonces_0 = assert.push_nonces(&config.verifier_0_context);
-    let secret_nonces_1 = assert.push_nonces(&config.verifier_1_context);
-
-    assert.pre_sign(
-        &config.verifier_0_context,
-        &config.connector_b,
-        &secret_nonces_0,
-    );
-    assert.pre_sign(
-        &config.verifier_1_context,
-        &config.connector_b,
-        &secret_nonces_1,
-    );
-
-    let assert_tx = assert.finalize();
-    let assert_txid = assert_tx.compute_txid();
-    let assert_result = config.client_0.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(
-        &config.operator_context,
-        &config.connector_5,
-        &config.connector_c,
-        disprove_input_0,
-        disprove_input_1,
-        script_index,
-    );
-
-    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, verifier_reward_script);
-
-    let disprove_tx = disprove.finalize();
-    let disprove_txid = disprove_tx.compute_txid();
-
-    // mine disprove
-    let disprove_result = config.client_0.esplora.broadcast(&disprove_tx).await;
-    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/tests/bridge/integration/peg_out/start_time.rs b/tests/bridge/integration/peg_out/start_time.rs
deleted file mode 100644
index b409d3c1c..000000000
--- a/tests/bridge/integration/peg_out/start_time.rs
+++ /dev/null
@@ -1,68 +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 config = 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(
-        config.operator_context.network,
-        &config.operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    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,
-    )
-    .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(
-        &config.operator_context,
-        &config.connector_2,
-        start_time_input_0,
-    );
-
-    let start_time_tx = start_time.finalize();
-
-    // mine start time
-    sleep(Duration::from_secs(60)).await;
-    let start_time_result = config.client_0.esplora.broadcast(&start_time_tx).await;
-    assert!(start_time_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 37b3b6e46..000000000
--- a/tests/bridge/kick_off_2/kick_off_2.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::str::FromStr;
-
-use bitcoin::{
-    block::{Header, Version},
-    Amount, BlockHash, CompactTarget, TxMerkleNode,
-};
-
-use bitvm::bridge::{
-    connectors::base::TaprootConnector,
-    graphs::{base::ONE_HUNDRED, peg_out::CommitmentMessageId},
-    superblock::{get_superblock_hash_message, get_superblock_message},
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_2::KickOff2Transaction,
-        signing_winternitz::WinternitzSigningInputs,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_kick_off_2_tx() {
-    let config = setup_test().await;
-
-    let input_value0 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address0 = config.connector_1.generate_taproot_address();
-    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,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-    );
-
-    let 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,
-    };
-    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();
-    // println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = config.client_0.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 999143f02..000000000
--- a/tests/bridge/kick_off_timeout/kick_off_timeout.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::base::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 config = setup_test().await;
-
-    let input_value0 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    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 tx = kick_off_timeout_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = config.client_0.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/mock/chain/mock.rs b/tests/bridge/mock/chain/mock.rs
deleted file mode 100644
index 5023f9dfe..000000000
--- a/tests/bridge/mock/chain/mock.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use async_trait::async_trait;
-use bitvm::bridge::client::chain::{
-    base::ChainAdaptor,
-    chain::{PegInEvent, PegOutBurntEvent, PegOutEvent},
-};
-
-pub struct MockAdaptor {
-    pub peg_out_init_events: Vec<PegOutEvent>,
-    pub peg_out_burnt_events: Vec<PegOutBurntEvent>,
-    pub peg_in_minted_events: Vec<PegInEvent>,
-}
-
-#[async_trait]
-impl ChainAdaptor for MockAdaptor {
-    async fn get_peg_out_init_event(&self) -> Result<Vec<PegOutEvent>, String> {
-        Ok(self.peg_out_init_events.clone())
-    }
-
-    async fn get_peg_out_burnt_event(&self) -> Result<Vec<PegOutBurntEvent>, String> {
-        Ok(self.peg_out_burnt_events.clone())
-    }
-
-    async fn get_peg_in_minted_event(&self) -> Result<Vec<PegInEvent>, String> {
-        Ok(self.peg_in_minted_events.clone())
-    }
-}
-
-impl Default for MockAdaptor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl MockAdaptor {
-    pub fn new() -> Self {
-        Self {
-            peg_out_init_events: vec![],
-            peg_out_burnt_events: vec![],
-            peg_in_minted_events: vec![],
-        }
-    }
-
-    pub fn from_peg_out_init(peg_out_init_events: Vec<PegOutEvent>) -> Self {
-        Self {
-            peg_out_init_events,
-            peg_out_burnt_events: vec![],
-            peg_in_minted_events: vec![],
-        }
-    }
-}
diff --git a/tests/bridge/mock/chain/mod.rs b/tests/bridge/mock/chain/mod.rs
deleted file mode 100644
index 9afc1d5e9..000000000
--- a/tests/bridge/mock/chain/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod mock;
diff --git a/tests/bridge/mock/mod.rs b/tests/bridge/mock/mod.rs
deleted file mode 100644
index 28ac57df5..000000000
--- a/tests/bridge/mock/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod chain;
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 14a774ac8..000000000
--- a/tests/bridge/peg_in/peg_in_deposit.rs
+++ /dev/null
@@ -1,47 +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 config = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let 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;
-
-    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();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = config.client_0.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 5399b4078..000000000
--- a/tests/bridge/peg_in/peg_in_refund.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::base::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 config = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    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();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = config.client_0.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/peg_in_graph.rs b/tests/bridge/serialization/peg_in_graph.rs
deleted file mode 100644
index 27cc3c192..000000000
--- a/tests/bridge/serialization/peg_in_graph.rs
+++ /dev/null
@@ -1,41 +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 config = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-
-    let 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;
-
-    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/tests/bridge/serialization/peg_out_graph.rs b/tests/bridge/serialization/peg_out_graph.rs
deleted file mode 100644
index 26dd9fbb7..000000000
--- a/tests/bridge/serialization/peg_out_graph.rs
+++ /dev/null
@@ -1,63 +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 config = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-
-    let 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;
-
-    let peg_in_graph = PegInGraph::new(
-        &config.depositor_context,
-        Input { outpoint, amount },
-        &config.depositor_evm_address,
-    );
-
-    let kick_off_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT); // Arbitrary amount
-
-    let kick_off_outpoint = generate_stub_outpoint(
-        &config.client_0,
-        &generate_pay_to_pubkey_script_address(
-            config.operator_context.network,
-            &config.operator_context.operator_public_key,
-        ),
-        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,
-        },
-    );
-
-    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/tests/bridge/setup.rs b/tests/bridge/setup.rs
deleted file mode 100644
index 71b661097..000000000
--- a/tests/bridge/setup.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-use std::collections::HashMap;
-
-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_6::Connector6, connector_a::ConnectorA, connector_b::ConnectorB,
-        connector_c::ConnectorC, 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,
-    }, graphs::{
-        base::{
-            DEPOSITOR_EVM_ADDRESS, DEPOSITOR_SECRET, OPERATOR_SECRET, VERIFIER_0_SECRET,
-            VERIFIER_1_SECRET, WITHDRAWER_EVM_ADDRESS, WITHDRAWER_SECRET,
-        },
-        peg_out::CommitmentMessageId,
-    }, superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH}, transactions::signing_winternitz::{
-        WinternitzPublicKey, WinternitzSecret,
-    }
-}, signatures::winternitz::Parameters};
-
-pub struct SetupConfig {
-    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_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 async fn setup_test() -> SetupConfig {
-    let source_network = Network::Testnet;
-    let destination_network = DestinationNetwork::EthereumSepolia;
-
-    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 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),
-        None,
-    )
-    .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),
-        None,
-    )
-    .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,
-        &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 {
-        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,
-        connector_6,
-        depositor_evm_address: DEPOSITOR_EVM_ADDRESS.to_string(),
-        withdrawer_evm_address: WITHDRAWER_EVM_ADDRESS.to_string(),
-        commitment_secrets,
-    }
-}
-
-// Use fixed secrets for testing to ensure repeatable spending addresses.
-fn get_test_commitment_secrets() -> HashMap<CommitmentMessageId, WinternitzSecret> {
-    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),
-        ),
-    ])
-}
-
-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/validate/validate.rs b/tests/bridge/validate/validate.rs
deleted file mode 100644
index 54a2e5446..000000000
--- a/tests/bridge/validate/validate.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::str::FromStr;
-
-use bitcoin::{Amount, OutPoint, Txid};
-
-use bitvm::bridge::{
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-        peg_out::PegOutGraph,
-    },
-    scripts::generate_burn_script,
-    transactions::{base::Input, pre_signed::PreSignedTransaction},
-};
-
-use super::super::setup::setup_test;
-
-#[tokio::test]
-async fn test_validate_success() {
-    let (peg_in_graph, peg_out_graph, _) = setup_and_create_graphs().await;
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-    let is_peg_out_data_valid = peg_out_graph.validate();
-
-    assert!(is_peg_in_data_valid);
-    assert!(is_peg_out_data_valid);
-}
-
-#[tokio::test]
-async fn test_validate_invalid_previous_output() {
-    let (mut peg_in_graph, _, peg_in_outpoint) = setup_and_create_graphs().await;
-
-    let changed_outpoint = OutPoint {
-        txid: peg_in_outpoint.txid,
-        vout: peg_in_outpoint.vout + 1,
-    };
-
-    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
-    deposit_tx.input[0].previous_output = changed_outpoint;
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-
-    assert!(!is_peg_in_data_valid);
-}
-
-#[tokio::test]
-async fn test_validate_invalid_script_sig() {
-    let (mut peg_in_graph, _, _) = setup_and_create_graphs().await;
-
-    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
-    deposit_tx.input[0].script_sig = generate_burn_script();
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-
-    assert!(!is_peg_in_data_valid);
-}
-
-#[tokio::test]
-async fn test_validate_invalid_sequence() {
-    let (mut peg_in_graph, _, _) = setup_and_create_graphs().await;
-
-    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
-    deposit_tx.input[0].sequence = bitcoin::Sequence(100);
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-
-    assert!(!is_peg_in_data_valid);
-}
-
-#[tokio::test]
-async fn test_validate_invalid_value() {
-    let (mut peg_in_graph, _, _) = setup_and_create_graphs().await;
-
-    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
-    deposit_tx.output[0].value = Amount::from_sat(1);
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-
-    assert!(!is_peg_in_data_valid);
-}
-
-#[tokio::test]
-async fn test_validate_invalid_script_pubkey() {
-    let (mut peg_in_graph, _, _) = setup_and_create_graphs().await;
-
-    let deposit_tx = peg_in_graph.peg_in_deposit_transaction.tx_mut();
-    deposit_tx.output[0].script_pubkey = generate_burn_script();
-
-    let is_peg_in_data_valid = peg_in_graph.validate();
-
-    assert!(!is_peg_in_data_valid);
-}
-
-async fn setup_and_create_graphs() -> (PegInGraph, PegOutGraph, OutPoint) {
-    let config = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
-    let peg_in_outpoint = OutPoint {
-        txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
-            .unwrap(),
-        vout: 0,
-    };
-    let peg_out_outpoint = OutPoint {
-        txid: Txid::from_str("4e254eab8a41f14f56491813a7100cebe305d84edf09488001d9dd3d180a4900")
-            .unwrap(),
-        vout: 0,
-    };
-
-    let peg_in_graph = PegInGraph::new(
-        &config.depositor_context,
-        Input {
-            outpoint: peg_in_outpoint,
-            amount,
-        },
-        &config.depositor_evm_address,
-    );
-
-    let (peg_out_graph, _) = PegOutGraph::new(
-        &config.operator_context,
-        &peg_in_graph,
-        Input {
-            outpoint: peg_out_outpoint,
-            amount,
-        },
-    );
-
-    (peg_in_graph, peg_out_graph, peg_in_outpoint)
-}