diff --git a/Cargo.lock b/Cargo.lock
index 89bab5f7..df894457 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2744,7 +2744,7 @@ dependencies = [
  "bitflags 2.11.0",
  "cexpr",
  "clang-sys",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "log",
  "prettyplease 0.2.37",
  "proc-macro2",
@@ -2866,7 +2866,7 @@ dependencies = [
  "tendermint-light-client-verifier",
  "tracing",
  "verifier",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-verifier",
  "zkm-zkvm",
 ]
@@ -5569,8 +5569,9 @@ dependencies = [
 [[package]]
 name = "garbled-snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227"
+source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#64e6373162deda32b88289a87e05093124d36b04"
 dependencies = [
+ "aes",
  "ark-bn254",
  "ark-crypto-primitives",
  "ark-ec",
@@ -5584,7 +5585,6 @@ dependencies = [
  "num-bigint 0.4.6",
  "num-traits",
  "once_cell",
- "poseidon2",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
@@ -6023,7 +6023,7 @@ dependencies = [
  "serde",
  "sha2 0.10.9",
  "verifier",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-zkvm",
 ]
 
@@ -9538,18 +9538,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "poseidon2"
-version = "0.1.0"
-source = "git+https://github.com/ProjectZKM/poseidon2#1ab68f436e220df5870cd6e39006804d5c806279"
-dependencies = [
- "cfg-if",
- "p3-field",
- "p3-koala-bear",
- "p3-symmetric",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren.git)",
-]
-
 [[package]]
 name = "potential_utf"
 version = "0.1.5"
@@ -9856,7 +9844,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "itertools 0.14.0",
  "log",
  "multimap 0.10.1",
@@ -12207,7 +12195,7 @@ dependencies = [
 [[package]]
 name = "soldering-host"
 version = "1.1.0"
-source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227"
+source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#64e6373162deda32b88289a87e05093124d36b04"
 dependencies = [
  "ark-bn254",
  "ark-crypto-primitives",
@@ -12480,7 +12468,7 @@ dependencies = [
  "tendermint-light-client-verifier",
  "tracing",
  "verifier",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-zkvm",
 ]
 
@@ -13908,7 +13896,7 @@ dependencies = [
 [[package]]
 name = "verifiable-circuit-babe"
 version = "0.0.1"
-source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227"
+source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#64e6373162deda32b88289a87e05093124d36b04"
 dependencies = [
  "aes",
  "ark-bn254",
@@ -13933,6 +13921,7 @@ dependencies = [
  "sha2 0.10.9",
  "tracing",
  "zkm-sdk",
+ "zkm-verifier",
  "zkm-zkvm",
 ]
 
@@ -15184,7 +15173,7 @@ dependencies = [
  "typenum",
  "vec_map",
  "zkm-curves",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-stark",
 ]
 
@@ -15236,7 +15225,7 @@ dependencies = [
  "zkm-core-executor",
  "zkm-curves",
  "zkm-derive",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-stark",
 ]
 
@@ -15278,7 +15267,7 @@ dependencies = [
  "thiserror 1.0.69",
  "tracing",
  "typenum",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-stark",
 ]
 
@@ -15302,7 +15291,7 @@ dependencies = [
  "elliptic-curve",
  "serde",
  "sha2 0.10.9",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
 ]
 
 [[package]]
@@ -15325,26 +15314,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "zkm-primitives"
-version = "1.2.7"
-source = "git+https://github.com/ProjectZKM/Ziren.git#7dc2037c6ef99d5772c756556350698fad01c559"
-dependencies = [
- "bincode",
- "blake3",
- "hex",
- "lazy_static",
- "num-bigint 0.4.6",
- "p3-field",
- "p3-koala-bear",
- "p3-monty-31",
- "p3-poseidon2",
- "p3-symmetric",
- "serde",
- "sha2 0.10.9",
- "tracing",
-]
-
 [[package]]
 name = "zkm-prover"
 version = "1.2.7"
@@ -15374,7 +15343,7 @@ dependencies = [
  "tracing-subscriber 0.3.23",
  "zkm-core-executor",
  "zkm-core-machine",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-recursion-circuit",
  "zkm-recursion-compiler",
  "zkm-recursion-core",
@@ -15408,7 +15377,7 @@ dependencies = [
  "zkm-core-executor",
  "zkm-core-machine",
  "zkm-derive",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-recursion-compiler",
  "zkm-recursion-core",
  "zkm-recursion-gnark-ffi",
@@ -15430,7 +15399,7 @@ dependencies = [
  "tracing",
  "vec_map",
  "zkm-core-machine",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-recursion-core",
  "zkm-recursion-derive",
  "zkm-stark",
@@ -15469,7 +15438,7 @@ dependencies = [
  "zkhash",
  "zkm-core-machine",
  "zkm-derive",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-stark",
 ]
 
@@ -15547,7 +15516,7 @@ dependencies = [
  "zkm-core-executor",
  "zkm-core-machine",
  "zkm-cuda",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-prover",
  "zkm-stark",
 ]
@@ -15590,7 +15559,7 @@ dependencies = [
  "tracing-forest",
  "tracing-subscriber 0.3.23",
  "zkm-derive",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-zkvm",
 ]
 
@@ -15624,7 +15593,7 @@ dependencies = [
  "thiserror 2.0.18",
  "zkm-core-executor",
  "zkm-core-machine",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
  "zkm-recursion-core",
  "zkm-sdk",
  "zkm-stark",
@@ -15646,7 +15615,7 @@ dependencies = [
  "serde",
  "sha2 0.10.9",
  "zkm-lib",
- "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)",
+ "zkm-primitives",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 647bb280..dcecddcf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,9 +106,9 @@ p3-field = { git = "https://github.com/ProjectZKM/Plonky3" }
 #zkm-verifier = { path = "../Ziren/crates/verifier" }
 
 bitvm-lib = { package = "bitvm-gc", path = "crates/bitvm-gc" }
-verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" }
-garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" }
-soldering-host = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" }
+verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3", features = ["aes"] }
+garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3", features = ["_aes"] }
+soldering-host = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3", features = ["aes"] }
 
 #verifiable-circuit-babe = { path = "../bitvm-gc/verifiable-circuit-babe"}
 #garbled-snark-verifier = { path = "../bitvm-gc/garbled-snark-verifier"}
diff --git a/circuits/header-chain-proof/guest/Cargo.lock b/circuits/header-chain-proof/guest/Cargo.lock
index 279dd297..f72deaeb 100644
--- a/circuits/header-chain-proof/guest/Cargo.lock
+++ b/circuits/header-chain-proof/guest/Cargo.lock
@@ -1141,7 +1141,7 @@ dependencies = [
  "serde",
  "sha2",
  "verifier",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-zkvm",
 ]
 
@@ -1315,7 +1315,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32"
+source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3"
 dependencies = [
  "cfg-if",
  "ecdsa 0.16.9 (git+https://github.com/ziren-patches/signatures.git?branch=patch-ecdsa-0.16.9)",
@@ -1324,7 +1324,7 @@ dependencies = [
  "once_cell",
  "sha2",
  "signature",
- "zkm-lib",
+ "zkm-lib 1.2.5",
 ]
 
 [[package]]
@@ -1606,14 +1606,14 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8"
+source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946"
 dependencies = [
  "ecdsa 0.16.9 (git+https://github.com/ziren-patches/signatures.git?branch=patch-ecdsa-0.16.9)",
  "elliptic-curve",
  "hex",
  "primeorder",
  "sha2",
- "zkm-lib",
+ "zkm-lib 1.2.5",
 ]
 
 [[package]]
@@ -2073,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "primeorder"
 version = "0.13.1"
-source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8"
+source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946"
 dependencies = [
  "elliptic-curve",
 ]
@@ -2498,7 +2498,7 @@ dependencies = [
 [[package]]
 name = "substrate-bn"
 version = "0.6.0"
-source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f"
+source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2508,7 +2508,7 @@ dependencies = [
  "num-bigint 0.4.6",
  "rand",
  "rustc-hex",
- "zkm-lib",
+ "zkm-lib 1.2.5",
 ]
 
 [[package]]
@@ -3251,7 +3251,7 @@ dependencies = [
  "typenum",
  "vec_map",
  "zkm-curves",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-stark",
 ]
 
@@ -3303,7 +3303,7 @@ dependencies = [
  "zkm-core-executor",
  "zkm-curves",
  "zkm-derive",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-stark",
 ]
 
@@ -3327,7 +3327,7 @@ dependencies = [
  "thiserror 1.0.69",
  "tracing",
  "typenum",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-stark",
 ]
 
@@ -3341,6 +3341,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "zkm-lib"
+version = "1.2.5"
+source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966"
+dependencies = [
+ "bincode",
+ "cfg-if",
+ "elliptic-curve",
+ "serde",
+ "sha2",
+ "zkm-primitives 1.2.5",
+]
+
 [[package]]
 name = "zkm-lib"
 version = "1.2.7"
@@ -3351,7 +3364,25 @@ dependencies = [
  "elliptic-curve",
  "serde",
  "sha2",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
+]
+
+[[package]]
+name = "zkm-primitives"
+version = "1.2.5"
+source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966"
+dependencies = [
+ "bincode",
+ "hex",
+ "lazy_static",
+ "num-bigint 0.4.6",
+ "p3-field",
+ "p3-koala-bear",
+ "p3-monty-31",
+ "p3-poseidon2",
+ "p3-symmetric",
+ "serde",
+ "sha2",
 ]
 
 [[package]]
@@ -3407,7 +3438,7 @@ dependencies = [
  "zkhash",
  "zkm-core-machine",
  "zkm-derive",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-stark",
 ]
 
@@ -3449,7 +3480,7 @@ dependencies = [
  "tracing-forest",
  "tracing-subscriber",
  "zkm-derive",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-zkvm",
 ]
 
@@ -3478,7 +3509,7 @@ dependencies = [
  "thiserror 2.0.18",
  "zkm-core-executor",
  "zkm-core-machine",
- "zkm-primitives",
+ "zkm-primitives 1.2.7",
  "zkm-recursion-core",
  "zkm-stark",
 ]
@@ -3499,8 +3530,8 @@ dependencies = [
  "rand",
  "serde",
  "sha2",
- "zkm-lib",
- "zkm-primitives",
+ "zkm-lib 1.2.7",
+ "zkm-primitives 1.2.7",
 ]
 
 [[package]]
diff --git a/crates/bitvm-gc/src/babe_adapter.rs b/crates/bitvm-gc/src/babe_adapter.rs
index 2dd305e9..ab9c6ce0 100644
--- a/crates/bitvm-gc/src/babe_adapter.rs
+++ b/crates/bitvm-gc/src/babe_adapter.rs
@@ -138,6 +138,7 @@ pub fn sample_finalized_instance_data(index: usize) -> FinalizedInstanceData {
         constant_labels_0: [S([0; 16]), S([0; 16])],
         constant_labels_1: vec![],
         b: G1Affine::identity(),
+        aes_salt: S([0; 16]),
     }
 }