Bridge use global secp256k1 context (BitVM#185)

* replace Secp256k1::new calls with global SECP256K1

* remove secp instance from base, verifier and operator contexts

* remove unused secp imports

* remove unnecessary &

* remove unused context args

* use newer api that does not need secp256k1 instance

Author: eyusufatik

Cargo.lock

@@ -50,6 +50,7 @@ ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitive
 ark-relations = { git = "https://github.com/arkworks-rs/snark/" }
 serial_test = "*"
 tqdm = "0.7"
+secp256k1 = { version = "0.29.1", features = ["global-context"]}
 
 [profile.dev]
 opt-level = 3

Cargo.toml

@@ -38,7 +38,7 @@ ark-bn254.workspace = true
 ark-groth16.workspace = true
 ark-ff.workspace = true
 ark-std.workspace = true
-
+secp256k1.workspace = true
 
 [profile.dev]
 opt-level = 3

bridge/Cargo.toml

@@ -39,9 +39,9 @@ impl ClientCommand {
         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) =
+            let (_, verifier_0_public_key) =
                 generate_keys_from_secret(Network::Bitcoin, VERIFIER_0_SECRET);
-            let (_, _, verifier_1_public_key) =
+            let (_, verifier_1_public_key) =
                 generate_keys_from_secret(Network::Bitcoin, VERIFIER_1_SECRET);
             vec![verifier_0_public_key, verifier_1_public_key]
         });

bridge/src/client/cli/client_command.rs

@@ -135,5 +135,5 @@ impl KeysCommand {
     }
 }
 fn pubkey_of(private_key: &str) -> PublicKey {
-    generate_keys_from_secret(Network::Bitcoin, private_key).2
+    generate_keys_from_secret(Network::Bitcoin, private_key).1
 }

bridge/src/client/cli/key_command.rs

@@ -30,9 +30,9 @@ impl QueryCommand {
         destination_network: DestinationNetwork,
         path_prefix: Option<&str>,
     ) -> Self {
-        let (_, _, verifier_0_public_key) =
+        let (_, verifier_0_public_key) =
             generate_keys_from_secret(Network::Bitcoin, VERIFIER_0_SECRET);
-        let (_, _, verifier_1_public_key) =
+        let (_, verifier_1_public_key) =
             generate_keys_from_secret(Network::Bitcoin, VERIFIER_1_SECRET);
 
         let n_of_n_public_keys: Vec<PublicKey> = vec![verifier_0_public_key, verifier_1_public_key];

bridge/src/client/cli/query_command.rs

@@ -23,7 +23,7 @@ use crate::{
         peg_in::{PegInDepositorStatus, PegInVerifierStatus},
         peg_out::{CommitmentMessageId, PegOutOperatorStatus},
     },
-    scripts::generate_pay_to_pubkey_script_address
+    scripts::generate_pay_to_pubkey_script_address,
 };
 
 use bitvm::signatures::signing_winternitz::WinternitzSecret;
@@ -202,21 +202,13 @@ impl BitVMClient {
         }
     }
 
-    pub fn get_data(&self) -> &BitVMClientPublicData {
-        &self.data
-    }
+    pub fn get_data(&self) -> &BitVMClientPublicData { &self.data }
 
-    pub async fn sync(&mut self) {
-        self.read().await;
-    }
+    pub async fn sync(&mut self) { self.read().await; }
 
-    pub async fn sync_l2(&mut self) {
-        self.read_from_l2().await;
-    }
+    pub async fn sync_l2(&mut self) { self.read_from_l2().await; }
 
-    pub async fn flush(&mut self) {
-        self.save().await;
-    }
+    pub async fn flush(&mut self) { self.save().await; }
 
     /*
     File syncing flow with data store
@@ -1102,7 +1094,6 @@ impl BitVMClient {
                 .unwrap()
                 .challenge(
                     &self.esplora,
-                    self.depositor_context.as_ref().unwrap(),
                     crowdfundng_inputs,
                     &self.depositor_context.as_ref().unwrap().depositor_keypair,
                     output_script_pubkey,
@@ -1113,7 +1104,6 @@ impl BitVMClient {
                 .unwrap()
                 .challenge(
                     &self.esplora,
-                    self.operator_context.as_ref().unwrap(),
                     crowdfundng_inputs,
                     &self.operator_context.as_ref().unwrap().operator_keypair,
                     output_script_pubkey,
@@ -1124,7 +1114,6 @@ impl BitVMClient {
                 .unwrap()
                 .challenge(
                     &self.esplora,
-                    self.verifier_context.as_ref().unwrap(),
                     crowdfundng_inputs,
                     &self.verifier_context.as_ref().unwrap().verifier_keypair,
                     output_script_pubkey,
@@ -1135,7 +1124,6 @@ impl BitVMClient {
                 .unwrap()
                 .challenge(
                     &self.esplora,
-                    self.withdrawer_context.as_ref().unwrap(),
                     crowdfundng_inputs,
                     &self.withdrawer_context.as_ref().unwrap().withdrawer_keypair,
                     output_script_pubkey,

bridge/src/client/client.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::{
@@ -60,7 +60,7 @@ impl TaprootConnector for Connector0 {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 

bridge/src/connectors/connector_0.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::{
     graphs::peg_out::CommitmentMessageId,
-    superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH}
+    superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH},
 };
 
-use bitvm::signatures::signing_winternitz::{winternitz_message_checksig_verify, WinternitzPublicKey};
+use bitvm::signatures::signing_winternitz::{
+    winternitz_message_checksig_verify, WinternitzPublicKey,
+};
 
 use super::{
     super::{
@@ -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")
     }
 

bridge/src/connectors/connector_1.rs

@@ -4,20 +4,18 @@ use crate::{
     constants::{N_SEQUENCE_FOR_LOCK_TIME, START_TIME_MESSAGE_LENGTH},
     graphs::peg_out::CommitmentMessageId,
 };
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
 use bitvm::{
     signatures::{
+        signing_winternitz::{winternitz_message_checksig, WinternitzPublicKey, LOG_D},
         utils::digits_to_number,
-        signing_winternitz::{
-            winternitz_message_checksig, WinternitzPublicKey, LOG_D,
-        },
     },
-    treepp::script
-};
-use bitcoin::{
-    key::Secp256k1,
-    taproot::{TaprootBuilder, TaprootSpendInfo},
-    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+    treepp::script,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -102,7 +100,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")
     }