cargo: Downgrade packages and apply BitVM patches.

Cargo.toml

@@ -18,10 +18,10 @@ sqlx = { version = "0.7.4", default-features = false }
 serial_test = "3.2.0"
 
 # bitcoin
-bitcoin = "0.32.3"
+bitcoin = "0.31.0"
 bitcoincore-rpc = "0.18.0"
 musig2 = { version = "0.0.11", features = ["serde"] }
-secp256k1 = { version = "0.29.1", features = ["serde", "rand-std"] }
+secp256k1 = { version = "0.28.1", features = ["serde", "rand-std"] }
 
 # async + gRPC
 tonic = { version = "0.12.3", features = [ "tls" ] }
@@ -40,10 +40,30 @@ borsh = { version = "1.5.1", features = ["derive"] }
 k256 = { version = "=0.13.3", default-features = false }
 risc0-build = "1.1.3"
 risc0-zkvm = { version = "1.1.3" }
-circuits = { git = "https://github.com/chainwayxyz/risc0-to-bitvm2" }
+circuits = { git = "https://github.com/chainwayxyz/risc0-to-bitvm2", branch = "downgrade_dependencies" }
+bitvm = { git = "https://github.com/BitVM/BitVM" }
 
 [patch.crates-io]
-bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "ca3cfa2" }
+bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", branch = "downgrade_bitcoin" }
+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" }
 
 [profile.release]
 lto = true

core/Cargo.toml

@@ -36,6 +36,7 @@ tokio-stream = { workspace = true }
 async-stream = { workspace = true }
 futures-util = { workspace = true }
 futures-core = { workspace = true }
+bitvm = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

core/src/errors.rs

@@ -13,9 +13,9 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 #[non_exhaustive]
 pub enum BridgeError {
-    /// Returned when the secp256k1 crate returns an error
-    #[error("Secpk256Error: {0}")]
-    Secp256k1Error(#[from] secp256k1::Error),
+    // /// Returned when the secp256k1 crate returns an error
+    // #[error("Secpk256Error: {0}")]
+    // Secp256k1Error(#[from] secp256k1::Error),
     /// Returned when the bitcoin crate returns an error in the sighash taproot module
     #[error("BitcoinSighashTaprootError: {0}")]
     BitcoinSighashTaprootError(#[from] bitcoin::sighash::TaprootError),