Merge ozan/kickoff-root-operations into withdrawal #231

ozankaymak · 2024-08-22T14:03:03Z

Closes #225 and #219.

ekrembal · 2024-08-23T13:31:23Z

core/src/transaction_builder.rs

+        };
+
+        let move_tx_simple =
+            TransactionBuilder::create_btc_tx(move_txins, vec![move_txout, anyone_can_spend_txout]);


We can use create_move_tx here

ekrembal · 2024-08-23T13:32:24Z

core/src/transaction_builder.rs

            &[relative_timelock_script.clone()],
            Some(*nofn_xonly_pk),
            network,
        );
-
+        let mut op_return_script: Vec<u8> = hex::decode(move_txid.to_string()).unwrap();
+        let op_return_idx: Vec<u8> = if operator_idx < 256 {


Can we write this better @lemonpartee ?
I just want to use less bytes here but i want this to work if there are more than 256 operators as well

This code snippet encodes variable n of type usize using least amount of bytes.

let usize_bytes = usize::BITS.div(8) as usize; let bits = n.max(1).ilog2() + 1; let len = bits.div_ceil(8) as usize; let empty = usize_bytes - len; let bytes = n.to_be_bytes(); let bytes = &bytes[empty..];

This code snippet would decode it.

let mut encoded = [0u8; 8]; encoded[empty..].copy_from_slice(bytes); let decoded = usize::from_be_bytes(encoded);

ekrembal · 2024-08-23T13:33:48Z

core/src/transaction_builder.rs

        TxHandler {
            tx,
            prevouts,
            scripts,
-            taproot_spend_infos,
+            taproot_spend_infos: vec![],


Let's add N-of-N and operator script here as well

ekrembal · 2024-08-23T13:51:28Z

core/src/verifier.rs

@@ -86,7 +95,7 @@ where
            self.config.network,
        )?;

-        let num_required_nonces = self.operator_xonly_pks.len() + 2;
+        let num_required_nonces = 3 * self.operator_xonly_pks.len() + 1;


Let's use 2*n+1 here since we won't be generating burn txs

ekrembal · 2024-08-23T13:54:58Z

core/src/verifier.rs

    async fn operator_kickoffs_generated(
        &self,
        deposit_outpoint: OutPoint,
        kickoff_utxos: Vec<UTXO>,
        operators_kickoff_sigs: Vec<secp256k1::schnorr::Signature>, // These are not transaction signatures, rather, they are to verify the operator's identity.
-        agg_nonces: Vec<MuSigAggNonce>,
-    ) -> Result<Vec<MuSigPartialSignature>, BridgeError> {
+        agg_nonces: (Vec<MuSigAggNonce>, Vec<MuSigAggNonce>), // First vector is for the slash_or_take_txs, the second vector is for the burn_txs.


Let's take all aggNonces in here, so that bridge backend can instantly aggregate pubNonces and send them back and delete them

ekrembal · 2024-08-23T14:05:12Z

core/src/verifier.rs

+                    &self.nofn_xonly_pk,
+                    &self.config.operators_xonly_pks[i],
+                );
+            let (musig2_and_operator_address, _) = TransactionBuilder::create_taproot_address(


Lets have a create_kickoff_address function in transaction_builder

ekrembal · 2024-08-23T14:07:35Z

core/src/verifier.rs

+        // .unwrap();
+        // let root_bytes: [u8; 32] = *root.as_byte_array();
+
+        self.db


We should save aggNonces first so that we can partialSign

ekrembal · 2024-08-23T14:08:42Z

core/src/verifier.rs

        &self,
        deposit_outpoint: OutPoint,
        _burn_sigs: Vec<schnorr::Signature>,
+        _slash_or_take_sigs: Vec<schnorr::Signature>,


We should also verify these slash_or_take_sigs

* 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>

lemonpartee · 2024-08-26T09:19:24Z

core/src/errors.rs

@@ -158,6 +158,12 @@ pub enum BridgeError {
    KickoffOutpointsNotFound,
    #[error("DepositInfoNotFound")]
    DepositInfoNotFound,
+
+    #[error("FromHexError: {0}")]
+    FromHexError(hex::FromHexError),


You don't have to manually implement From if you use this syntax.

Suggested change

FromHexError(hex::FromHexError),

FromHexError(#[from] hex::FromHexError),

lemonpartee · 2024-08-26T09:21:05Z

core/src/servers.rs

    let verifier = Verifier::new(rpc, config).await?;

-    let addr = match server.local_addr() {
+    let addr: std::net::SocketAddr = match server.local_addr() {


Suggested change

let addr: std::net::SocketAddr = match server.local_addr() {

let addr: std::net::SocketAddr = server.local_addr().map_err(|e| BridgeError::ServerError(e)|)?;

lemonpartee

Left a couple nits

* 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>

WIP Implement endpoints with db operations and tests

b9be24e

ozankaymak changed the base branch from main to withdrawal August 22, 2024 14:03

ozankaymak marked this pull request as draft August 22, 2024 14:04

ozankaymak requested a review from ekrembal August 22, 2024 14:04

ekrembal and others added 4 commits August 23, 2024 11:40

wip

a0e9b09

WIP

cbef569

WIP

46c577d

Implement changes

b5971c6

ozankaymak marked this pull request as ready for review August 23, 2024 13:22

ekrembal requested changes Aug 23, 2024

View reviewed changes

Apply review changes

37eb26d

ozankaymak requested a review from ekrembal August 23, 2024 14:47

ekrembal approved these changes Aug 23, 2024

View reviewed changes

Refactor the binaries

faf0326

ekrembal requested a review from lemonpartee August 26, 2024 08:26

Rename, refactor

5d80aa4

This was linked to issues Aug 26, 2024

Change config.toml files #219

Closed

Fix operator related binaries #225

Closed

ekrembal approved these changes Aug 26, 2024

View reviewed changes

ekrembal merged commit 15e7f80 into withdrawal Aug 26, 2024

ekrembal deleted the ozan/kickoff-root-operations branch August 26, 2024 08:53

lemonpartee reviewed Aug 26, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge ozan/kickoff-root-operations into withdrawal #231

Merge ozan/kickoff-root-operations into withdrawal #231

ozankaymak commented Aug 22, 2024 •

edited

Loading

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

lemonpartee Aug 26, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

ekrembal Aug 23, 2024

ozankaymak Aug 23, 2024

lemonpartee Aug 26, 2024

lemonpartee Aug 26, 2024

lemonpartee left a comment

	FromHexError(hex::FromHexError),
	FromHexError(#[from] hex::FromHexError),

	let addr: std::net::SocketAddr = match server.local_addr() {
	let addr: std::net::SocketAddr = server.local_addr().map_err(\|e\| BridgeError::ServerError(e)\|)?;

Merge ozan/kickoff-root-operations into withdrawal #231

Merge ozan/kickoff-root-operations into withdrawal #231

Conversation

ozankaymak commented Aug 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lemonpartee left a comment

Choose a reason for hiding this comment

ozankaymak commented Aug 22, 2024 •

edited

Loading