Merge MuSig2 functions into ekrem/new-architecture #206

ozankaymak · 2024-08-06T13:54:26Z

Description

This PR introduces the complete musig2 functionality, built on top of this
musig2 implementation.

Linked Issues

Related to #205.

Testing

Unit tests, dummy transaction verification tests, and rpc tests are implemented.

Docs

Code is documented.

ekrembal

I think whats left is aggregate nonces and partial signatures. And tests also

ekrembal · 2024-08-06T17:27:38Z

core/Cargo.toml

@@ -28,6 +28,7 @@ clap = { workspace = true, features = ["derive"] }
 toml = { workspace = true }
 sqlx = { workspace = true, features = ["runtime-tokio", "postgres"] }
 bitcoin-mock-rpc = { workspace = true }
+musig2 = { version = "0.0.11" }


we can use workspace=true here

ekrembal · 2024-08-06T17:28:00Z

core/src/errors.rs

+
+impl From<musig2::errors::KeyAggError> for BridgeError {
+    fn from(_err: musig2::errors::KeyAggError) -> Self {
+        BridgeError::KeyAggContextError


Pls propogate the original message in this

ekrembal · 2024-08-06T17:31:42Z

We also need tweaked signatures as well

ekrembal

Add test for signing taproot txs

ekrembal · 2024-08-07T12:10:30Z

core/src/musig2.rs

+// MuSigSecNonce consists of two scalars, so it's 64 bytes.
+pub type MuSigSecNonce = [u8; 64];
+// MuSigAggNonce is a scalar, so it's 32 bytes.
+pub type MuSigAggNonce = [u8; 32];


This should be two curve points

ekrembal · 2024-08-07T12:21:24Z

core/src/musig2.rs

+    keypair: &secp256k1::Keypair,
+    rng: &mut impl Rng,
+    pks: Vec<PublicKey>,
+    tweak: Option<[u8; 32]>,


we don't need tweak and pks here

ekrembal · 2024-08-07T12:24:29Z

I think we need 3 tests:

one for signing a 32 byte hash and verifying the agg signature with agg pubkey
one for signing a taproot key spend that does have some script spending paths so tweak is needed
one for signing a taproot from a script spending path with aggPubkey checkSig

core/src/musig2.rs

…ormatting

ekrembal · 2024-08-08T16:42:13Z

core/src/transaction_builder.rs

+            return Err(BridgeError::TaprootScriptError);
+        }
+
+        let taproot_builder = if n > 1 {


There is a code duplication here

I do not understand what you mean.

* Set rpc endpoints and impl operator new deposit * Impl verifier new_deposit * Impl operator_kickoffs_generated * impl more verifier functions * Merge MuSig2 functions into ekrem/new-architecture (#206) * Add some musig2 functionalities * Some changes in general and in MuSig2 * Change musig2 functions * Add one small test * Added three more simple tests * Add test with dummy_tx key_spend * Add test with dummy_tx script_spend * Add rpc tests for key_spend and script_spend * Add wrappers for aggregate_nonces and aggregate_partial_signatures, formatting * Cargo fmt * Small change for config file * Some refactor * (WIP) Change XOnlyPublicKeys to PublicKeys in config files * Fix errors from pk-xonlypk change * More refactor * Remove code duplication * More refactor * Commentation + more refactor * Trying something * Removed Cargo.lock + add to .gitignore * Create XOnlyPublicKeys from PublicKeys using an extension trait (#216) Reduces code duplication and isolates the reponsibility to a dedicated function * Finalize new architecture for deposit except db operations (#211) * WIP * Fix some errors * WIP * Merge ozan/new-architecture-improvments into ekrem/new-architecture-improvments (#218) * WIP Impl. new endpoints * WIP Impl. new endpoints * nits * Implement move txs partial sig * WIP db nonce * Use UTXO instead of PsbtOutpoint * remove redundant db funcs --------- Co-authored-by: ozankaymak <92448699+ozankaymak@users.noreply.github.com> * Update DB for New Architecture (#222) * Change the db file for the new architecture * Change some UTXOs to OutPoints, add some checks * WIP Fix inconsistencies * WIP Impl database wrappers * Update schema * Fix some db * WIP * nits * Fix error for a wrapper, add some example db trait impl. and db func. * nits * WIP Impl. database functions --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> * Merge DB changes to ekrem/new-architecture (#227) * Update config files and impl. some db tests * WIP Fix checks and tests * (WIP) Add test for nonce table, fix small errors * (WIP) Add more tests for nonces table * (WIP) Add tests for get_pub_nonce * (WIP) Add test for deposit_utxo * Change operator new_deposit with new schema * WIP * DecodeRow inside the function * Current tests work * WIP * Fix Json issue with UTXODB * Clean wrapper.rs and formatting * Add tests for deposit_kickoff_generator_txs table * Apply review --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> * Remove code duplication (#228) * Merge withdrawal into ekrem/new-architecture (#234) * WIP * nits * Add sig check for withdrawal (#229) * Add sig check for withdrawal * Use tx.verify --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> * Impl operator paying withdrawal * Merge ozan/withdrawal-endpoint-test into ekrem-new-architecture (#230) * wip * WIP: created operators and verifiers * Add steps for the flow * Add withdrawal endpoint test,organize configs * Flaky but ok * Fix flakiness * Remove unnecessary serialization --------- Co-authored-by: lemonpartee <lemonpartey@proton.me> Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> * Merge ozan/kickoff-root-operations into withdrawal (#231) * WIP Implement endpoints with db operations and tests * wip * WIP * WIP * Implement changes * Apply review changes * Refactor the binaries * Rename, refactor --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> Co-authored-by: lemonpartee <lemonpartey@proton.me> * Implement sig_agg helpers (#237) Co-authored-by: ozankaymak <ozan.kaymak@boun.edu.tr> * Deposit test (#232) * wip * WIP: created operators and verifiers * Add steps for the flow * wip * Test e2e deposit flow * Undo unrelated changes * Fix agg nonces and use same deposit * Adjust test flow after rebase to withdrawal * Use create verifiers and operators func * Works until set_operator_funding_utxo_rpc * Fix create operators and verifiers * Fix sig aggregation * nits * WIP * WIP MuSig2VerifyError(BadSignature) * Debug * Fix error * Send move_tx + refactor --------- Co-authored-by: Ekrem BAL <mail.ekrembal@gmail.com> Co-authored-by: ozankaymak <ozan.kaymak@boun.edu.tr> * Apply review + refactor (#243) * Remove unused dependencies (#238) * Remove unused utils (#239) * Add docker compose with database (#245) * Introduce dockerized PostgresSQL database compatible with integration tests * refactor compose * Full withdrawal flow (#253) * Save operator take and slash or take sigs * Operator can find kickoff utxo * Operator can send kickoff tx onchain * WIP verifiers and operators should use same db missing * Fix bugs * WIP Boths sigs verified but operator_take_tx fails * WIP MuSig2 fix * Fix withdrawal happy part test * nits * Fix musig test * Use key aggregator trait --------- Co-authored-by: ozankaymak <ozan.kaymak@boun.edu.tr> * get rid of basic workflow * Workflow improvements (#251) (#255) * workflow: Add all-targets flag to clippy. * workflow: Add the new build_and_test workflow. * workflow: Remove all features and move services. * workflow: Remove old basic workflow. * workflow: Add cache warm ups for build and test. * workflow: Add all features flag to build and test. * workflow: Lower healt-retries to 5. Co-authored-by: Ceyhun Şen <ceyhuusen@gmail.com> * workflow: remove all features. * Merge "clippy" into "ekrem/new-architecture" * Fix CI config toml * Change CI config + remove warnings * Apply clippy suggestions for all * nits * Fix duplication * Fix CI error * Apply more clippy suggestions (#256) * cargo: Update mock_rpc. * workflow: Re-add --all-features. * workflow: Upgrade 4 cores to 16 cores. * perf: Insert nonces in a single batch (#248) * Cargo upgrade * minimize op_return usage * fmt --------- Co-authored-by: ozankaymak <92448699+ozankaymak@users.noreply.github.com> Co-authored-by: lemonpartee <lemonpartey@proton.me> Co-authored-by: ozankaymak <ozan.kaymak@boun.edu.tr> Co-authored-by: Ceyhun Şen <ceyhuusen@gmail.com>

Add some musig2 functionalities

efaf4d7

ozankaymak changed the base branch from main to ekrem/new-architecture August 6, 2024 13:54

ozankaymak requested a review from ekrembal August 6, 2024 13:55

ekrembal reviewed Aug 6, 2024

View reviewed changes

Some changes in general and in MuSig2

866cbb7

ekrembal requested changes Aug 7, 2024

View reviewed changes

ozankaymak added 5 commits August 7, 2024 17:23

Change musig2 functions

b12350f

Add one small test

b8e6238

Added three more simple tests

9c4901a

Add test with dummy_tx key_spend

9aef433

Add test with dummy_tx script_spend

b30132e

ekrembal reviewed Aug 8, 2024

View reviewed changes

core/src/musig2.rs Show resolved Hide resolved

ozankaymak added 3 commits August 8, 2024 16:25

Add rpc tests for key_spend and script_spend

8d417c3

Add wrappers for aggregate_nonces and aggregate_partial_signatures, f…

d6be7f5

…ormatting

Cargo fmt

fce1403

ozankaymak requested a review from ekrembal August 8, 2024 13:43

ozankaymak marked this pull request as ready for review August 8, 2024 13:44

ozankaymak added 2 commits August 8, 2024 16:46

Small change for config file

6d556fd

Some refactor

6a58304

ekrembal requested changes Aug 8, 2024

View reviewed changes

ozankaymak and others added 8 commits August 9, 2024 10:38

(WIP) Change XOnlyPublicKeys to PublicKeys in config files

c0e2c4a

Fix errors from pk-xonlypk change

a3a2776

More refactor

8e3adde

Merge pull request #209 from chainwayxyz/ozan/config-pk-and-xonly-pk-fix

50850ca

Remove code duplication

9f483b6

More refactor

8b60a20

Commentation + more refactor

faf3ad6

Trying something

adcbbf4

Removed Cargo.lock + add to .gitignore

298568a

ekrembal approved these changes Aug 9, 2024

View reviewed changes

ekrembal merged commit 05cba06 into ekrem/new-architecture Aug 9, 2024

ekrembal deleted the ozan/new-architecture-musig2 branch August 9, 2024 12:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge MuSig2 functions into ekrem/new-architecture #206

Merge MuSig2 functions into ekrem/new-architecture #206

ozankaymak commented Aug 6, 2024 •

edited

Loading

ekrembal left a comment

ekrembal Aug 6, 2024

ekrembal Aug 6, 2024

ekrembal commented Aug 6, 2024

ekrembal left a comment

ekrembal Aug 7, 2024

ekrembal Aug 7, 2024

ekrembal commented Aug 7, 2024

ekrembal Aug 8, 2024

ozankaymak Aug 9, 2024

Merge MuSig2 functions into ekrem/new-architecture #206

Merge MuSig2 functions into ekrem/new-architecture #206

Conversation

ozankaymak commented Aug 6, 2024 • edited Loading

Description

Linked Issues

Testing

Docs

ekrembal left a comment

Choose a reason for hiding this comment

ekrembal Aug 6, 2024

Choose a reason for hiding this comment

ekrembal Aug 6, 2024

Choose a reason for hiding this comment

ekrembal commented Aug 6, 2024

ekrembal left a comment

Choose a reason for hiding this comment

ekrembal Aug 7, 2024

Choose a reason for hiding this comment

ekrembal Aug 7, 2024

Choose a reason for hiding this comment

ekrembal commented Aug 7, 2024

ekrembal Aug 8, 2024

Choose a reason for hiding this comment

ozankaymak Aug 9, 2024

Choose a reason for hiding this comment

ozankaymak commented Aug 6, 2024 •

edited

Loading