diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 898a9e79..46dd6431 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -112,6 +112,14 @@ jobs: "029ac20335eb38768d2052be1dbbc3c8f6178407458e51e6b4ad22f1d91758895b", ] num_verifiers = 5 + operators_xonly_pks = [ + "034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa", + "02466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27", + "023c72addb4fdf09af94f0c94d7fe92a386a7e70cf8a1d85916386bb2535c7b1b1", + "032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991", + "029ac20335eb38768d2052be1dbbc3c8f6178407458e51e6b4ad22f1d91758895b", + ] + num_verifiers = 5 operators_xonly_pks = [ "4f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa", "466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27", @@ -120,6 +128,7 @@ jobs: "9ac20335eb38768d2052be1dbbc3c8f6178407458e51e6b4ad22f1d91758895b", ] num_operators = 5 + db_file_path = "database" confirmation_threshold = 1 network = "regtest" bitcoin_rpc_url = "http://127.0.0.1:18443" @@ -209,22 +218,35 @@ jobs: port = 3000 secret_key = "5555555555555555555555555555555555555555555555555555555555555555" verifiers_public_keys = [ + "034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa", + "02466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27", + "023c72addb4fdf09af94f0c94d7fe92a386a7e70cf8a1d85916386bb2535c7b1b1", + "032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991", + "029ac20335eb38768d2052be1dbbc3c8f6178407458e51e6b4ad22f1d91758895b", + ] + num_verifiers = 5 + operators_xonly_pks = [ "4f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa", "466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27", "3c72addb4fdf09af94f0c94d7fe92a386a7e70cf8a1d85916386bb2535c7b1b1", "2c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991", "9ac20335eb38768d2052be1dbbc3c8f6178407458e51e6b4ad22f1d91758895b", ] + num_operators = 5 db_file_path = "database" - num_verifiers = 4 - min_relay_fee = 305 - user_takes_after = 200 - confirmation_treshold = 1 + confirmation_threshold = 1 network = "regtest" bitcoin_rpc_url = "http://127.0.0.1:18443" bitcoin_rpc_user = "admin" bitcoin_rpc_password = "admin" - all_secret_keys = [ + all_verifiers_secret_keys = [ + "1111111111111111111111111111111111111111111111111111111111111111", + "2222222222222222222222222222222222222222222222222222222222222222", + "3333333333333333333333333333333333333333333333333333333333333333", + "4444444444444444444444444444444444444444444444444444444444444444", + "5555555555555555555555555555555555555555555555555555555555555555", + ] + all_operators_secret_keys = [ "1111111111111111111111111111111111111111111111111111111111111111", "2222222222222222222222222222222222222222222222222222222222222222", "3333333333333333333333333333333333333333333333333333333333333333", diff --git a/core/src/musig2.rs b/core/src/musig2.rs index beafb484..434f2485 100644 --- a/core/src/musig2.rs +++ b/core/src/musig2.rs @@ -486,7 +486,7 @@ mod tests { XOnlyPublicKey::from_musig2_pks(pks, merkle_root, true); // musig2::verify_single(musig_agg_pubkey, &final_signature, message) // .expect("Verification failed!"); - let res = utils::SECP + let _res = utils::SECP .verify_schnorr( &secp256k1::schnorr::Signature::from_slice(&final_signature).unwrap(), &Message::from_digest(message), @@ -575,7 +575,7 @@ mod tests { .unwrap(); // musig2::verify_single(musig_agg_pubkey, &final_signature, message) // .expect("Verification failed!"); - let res = utils::SECP + let _res = utils::SECP .verify_schnorr( &secp256k1::schnorr::Signature::from_slice(&final_signature).unwrap(), &Message::from_digest(message), diff --git a/core/tests/common.rs b/core/tests/common.rs index 27651c91..a65fcdd8 100644 --- a/core/tests/common.rs +++ b/core/tests/common.rs @@ -2,9 +2,7 @@ use bitcoin::Address; use bitcoin::OutPoint; -use bitcoin::Transaction; use clementine_circuits::constants::BRIDGE_AMOUNT_SATS; -use clementine_circuits::constants::OPERATOR_TAKES_AFTER; use clementine_core::actor::Actor; use clementine_core::config::BridgeConfig; use clementine_core::database::common::Database; @@ -27,11 +25,8 @@ use clementine_core::UTXO; use clementine_core::{ create_extended_rpc, create_test_config, create_test_config_with_thread_name, }; -use crypto_bigint::rand_core::OsRng; use jsonrpsee::http_client::HttpClient; use jsonrpsee::server::ServerHandle; -use secp256k1::rand::Rng; -use secp256k1::SecretKey; use std::net::SocketAddr; use std::thread; diff --git a/core/tests/musig2.rs b/core/tests/musig2.rs index ee998f60..649a2a39 100644 --- a/core/tests/musig2.rs +++ b/core/tests/musig2.rs @@ -214,7 +214,7 @@ async fn test_musig2_key_spend_with_script() { musig2::verify_single(musig_agg_pubkey, &final_signature, message) .expect("Verification failed!"); let schnorr_sig = secp256k1::schnorr::Signature::from_slice(&final_signature).unwrap(); - let res = secp + let _res = secp .verify_schnorr( &schnorr_sig, &Message::from_digest(message), @@ -224,7 +224,7 @@ async fn test_musig2_key_spend_with_script() { // println!("MuSig2 signature verified successfully!"); // println!("SECP Verification: {:?}", res); tx_details.tx.input[0].witness.push(&final_signature); - let txid = rpc.send_raw_transaction(&tx_details.tx).unwrap(); + let _txid = rpc.send_raw_transaction(&tx_details.tx).unwrap(); // println!("Transaction sent successfully! Txid: {}", txid); }