feat(utxo-swap): add utxo burn output for non-kmd taker fee #2112

dimxy · 2024-05-06T18:34:05Z

Adds a burn output sending 25% of the taker utxo DEX fee to a dedicated pre-burn address. Funds collected on the pre-burn address will be traded for KMD to burn them (thus additionally burning KMD supply).
This PR partially closes #2010

The requirements for this PR: #2269

In this PR:

NOTE: As mocktopus now is marked 'optional = true' in coins Cargo.toml and activated from the mm2_main crate by adding features = ["mocktopus"] in [dev-dependencies] section, you also need to mark your mockable code, called from other crates, this way: #[cfg_attr(feature = "mocktopus", mockable)], otherwise mocks won't work (see samples in code)

TODO:

fix burn zaddr (enable burn for zcoin)
disable non-split non-kmd dex fee (no burn output) validation when all taker nodes upgrade to new dex fee splitting

* dev: docs(README): remove outdated information from the README (#2097) fix(sia): fix sia compilation after hd wallet PR merge (#2103) feat(hd_wallet): utxo and evm hd wallet and trezor (#1962) feat(sia): initial Sia integration (#2086) fix(BCH): deserialize BCH header that uses KAWPOW version correctly (#2099) fix(eth_tests): remove ETH_DEV_NODE from tests (#2101)

fix is_kmd in TestCoin

* dev: feat(tendermint): pubkey-only activation and unsigned tx (#2088) fix(tests): set txfee for some tbtc tests (#2116) fix(eth): remove my_address from sign_and_send_transaction_with_keypair (#2115) fix(utxo-swap): apply events occurred while taker down (#2114) refactor(memory): memory usage improvements (#2098) feat(app-dir): implement root application dir `.kdf` (#2102) fix tendermint fee calculation (#2106) update dockerfile (#2104)

* dev: feat(ETH): eip1559 gas fee estimator and rpcs (#2051) fix(p2pk-tests): fix p2pk tests post merge (#2119) fix(p2pk): show and spend P2PK balance (#2053) fix(swap): use tmp file for swap and order files (#2118)

fix zhtlc send and spend tests

add should_burn_dex_fee method to indicate which coin has burn output

* dev: fix(indexeddb): window usage in worker env (#2131) feat(tx-history): handle encoded transaction values (#2133) fix(core): tendermint withdraws on hd accounts (#2130) fix(core): improve validation rules for table names (#2123) fix(test): improve log wait condition to fix taker restart test (#2125)

…er test add timeout in wait for fee in qrc20 docker test

… docker test failed due to different dex fee values if trait default impl was used)

laruh

Great progress! Here is the first review iteration

mm2src/coins/lp_coins.rs

use same ovk for dex fee and burn outputs

add sanity check for dex_fee in calc_burn_amount_for_op_return

borngraced

Great work! I have one more review after this

borngraced · 2025-01-20T10:54:35Z

mm2src/coins/lp_coins.rs

+#[cfg(feature = "for-tests")]
+pub static mut TEST_BURN_ADDR_RAW_PUBKEY: Option<Vec<u8>> = None;
+


please can you move this down to where all const are declared? to avoid having declaration before import statements.

Q: TEST_BURN_ADDR_RAW_PUBKEY is read with run-docker-tests and for-tests features

why not initialize TEST_BURN_ADDR_RAW_PUBKEY with lazy_static once with docker-test and for-tests feature directives to avoid doing something like mutating/writing unsafe

I need this var initialised only for couple of tests (testing cases when taker is also a burn pubkey), that's why I have to init it with a env var.

borngraced · 2025-01-20T11:23:28Z

mm2src/coins/lp_coins.rs

            MmCoinEnum::SlpToken(ref c) => c.as_ref().rpc_client.is_native(),
            #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
+            // TODO: we do not have such feature = "zhtlc" in toml. Remove this cfg part?


Yes, I believe it can be removed.
#[cfg(not(target_arch = "wasm32"))] should be enough

borngraced · 2025-01-20T11:33:13Z

mm2src/coins/tendermint/tendermint_coin.rs

+        let activated_priv_key = if let Ok(activated_priv_key) = self.activation_policy.activated_key_or_err() {
+            activated_priv_key
+        } else {


Yeah, I had to change this because this code did not build when mockable attr was added.

borngraced · 2025-01-20T11:33:25Z

mm2src/coins/tendermint/tendermint_coin.rs

+        let priv_key = if let Some(priv_key) = priv_key {
+            priv_key
+        } else {


same as above

same, did not compile with mockable attr

borngraced · 2025-01-20T11:35:26Z

mm2src/coins/tendermint/tendermint_coin.rs

+        let account_prefix = self.account_prefix.clone();
        let base_account = match BaseAccount::decode(account.value.as_slice()) {
            Ok(account) => account,
-            Err(err) if &self.account_prefix == "iaa" => {
+            Err(err) if account_prefix.as_str() == "iaa" => {


bcz did not compile with mocktopus added (seems some issues with code processing in their macro)

borngraced · 2025-01-20T11:57:11Z

mm2src/common/common.rs


 pub const PROXY_REQUEST_EXPIRATION_SEC: i64 = 15;

 lazy_static! {
    pub static ref DEX_FEE_ADDR_RAW_PUBKEY: Vec<u8> =
        hex::decode(DEX_FEE_ADDR_PUBKEY).expect("DEX_FEE_ADDR_PUBKEY is expected to be a hexadecimal string");
+    pub static ref DEX_BURN_ADDR_RAW_PUBKEY: Vec<u8> =
+        hex::decode(DEX_BURN_ADDR_PUBKEY).expect("DEX_BURN_ADDR_PUBKEY is expected to be a hexadecimal string");
 }


I believe TEST_DEX_BURN_ADDR_RAW_PUBKEY belongs here...

TEST_DEX_BURN_ADDR_RAW_PUBKEY was fixed to actual DEX_BURN_ADDR_PUBKEY

borngraced · 2025-01-20T12:07:39Z

mm2src/mm2_main/src/lp_swap/taker_swap.rs

 use common::executor::Timer;
 use common::log::{debug, error, info, warn};
-use common::{bits256, now_ms, now_sec, wait_until_sec, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::{bits256, env_var_as_bool, now_ms, now_sec, wait_until_sec};


env_var_as_bool unused?

borngraced · 2025-01-20T12:10:58Z

mm2src/mm2_main/src/lp_swap.rs

+/// NegotiationDataMsg with version
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+pub struct NegotiationDataMsgVersion {
+    version: u16,
+    msg: NegotiationDataMsg,
+}


Suggested change

/// NegotiationDataMsg with version

#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]

pub struct NegotiationDataMsgVersion {

version: u16,

msg: NegotiationDataMsg,

}

/// NegotiationDataMsg with version

#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]

pub struct NegotiationDataMsgWithVersion {

version: u16,

msg: NegotiationDataMsg,

}

NegotiationDataMsgWithVersion is a better name

removed version support for now

borngraced · 2025-01-20T12:12:40Z

mm2src/mm2_main/src/lp_swap.rs

+impl NegotiationDataMsgVersion {
+    pub fn version(&self) -> u16 { self.version }
+
+    pub fn started_at(&self) -> u64 { self.msg.started_at() }
+
+    pub fn payment_locktime(&self) -> u64 { self.msg.payment_locktime() }
+
+    pub fn secret_hash(&self) -> &[u8] { self.msg.secret_hash() }
+
+    pub fn maker_coin_htlc_pub(&self) -> &[u8] { self.msg.maker_coin_htlc_pub() }
+
+    pub fn taker_coin_htlc_pub(&self) -> &[u8] { self.msg.taker_coin_htlc_pub() }
+
+    pub fn maker_coin_swap_contract(&self) -> Option<&[u8]> { self.msg.maker_coin_swap_contract() }
+
+    pub fn taker_coin_swap_contract(&self) -> Option<&[u8]> { self.msg.taker_coin_swap_contract() }
+}


these are redundancy, we should remove or is there a reason why we can't make msg and version pub?

removed this version related code

borngraced · 2025-01-20T12:15:05Z

mm2src/mm2_main/src/lp_swap/maker_swap.rs

+        #[cfg(feature = "run-docker-tests")]
+        let version = if !env_var_as_bool("USE_OLD_VERSION_MAKER") {
+            LEGACY_SWAP_MSG_VERSION
+        } else {
+            0 // use old version for tests
+        };
+
+        #[cfg(not(feature = "run-docker-tests"))]
+        let version = LEGACY_SWAP_MSG_VERSION;


can this be extracted to a separate inline function and reuse in taker_swap too?

removed this code (with version support removal in favour of versions in order matching)

dimxy · 2025-01-20T17:05:02Z

mm2src/mm2_main/src/lp_swap.rs

+/// NegotiationDataMsg with version
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+pub struct NegotiationDataMsgVersion {
+    version: u16,


As our discussion about versioning is inclining to put maker and taker version into orders, maybe we don't need this version field.

As our discussion about versioning is inclining to put maker and taker version into orders, maybe we don't need this version field.

I believe if we currently don’t require such feature, it’s better to leave it out for now. We can always introduce it later when we are sure that negotiation version support is necessary. This helps keep things simpler and avoids adding unused fields/types.

removed version from negotiation e4e8de0

laruh

Thanks for the updates, here is quick note I want to cover

laruh · 2025-01-21T11:50:17Z

mm2src/mm2_main/src/lp_swap/maker_swap.rs

+    /// Swap message exchange version supported by remote taker peer. Optional because it is found at negotiation
+    pub taker_version: Option<u16>,


Why you didnt use skip_serializing_if annotation? Not sure its safe to not to use it, please re check it.
Also Its better to rename field to taker_negotiation_msg_v. It is clearer.

Same for LEGACY_SWAP_MSG_VERSION. Its about negotiation msg version, not all swap p2p messages. Should be LEGACY_SWAP_NEGOTIATION_MSG_V

Its about negotiation msg version, not all swap p2p messages.

Not quite: it's about the swap message version supported by a party. I meant it for the whole message set used in the swap, not only negotiation

Why you didnt use skip_serializing_if annotation?

skip_serializing_if does not matter for rmp (checked with a test sample).
There is also the same var in the MakerSwapData struct. Not sure it's worth adding skip_serializing_if there: IMO it's easier to analyse swap jsons if "taker_version": null present, don't you think?

Also Its better to rename field to taker_negotiation_msg_v. It is clearer.

I renamed it to taker_msg_version and maker_msg_version 897aa4d.
It's worth renaming indeed but I did not like losing the key work 'version'. Also did not add 'negotiation' considering the above

Its about negotiation msg version, not all swap p2p messages.

Not quite: it's about the swap message version supported by a party. I meant it for the whole message set used in the swap, not only negotiation

I think then it doesnt make sense, p2p message versions (I mean all topic related messages) are handled in process_p2p_message. If you change p2p msg version it means user should be subscribed to another topic version

komodo-defi-framework/mm2src/mm2_main/src/lp_network.rs

Lines 144 to 168 in 897aa4d

let mut split = message.topic.as_str().split(TOPIC_SEPARATOR);

match split.next() {

Some(lp_ordermatch::ORDERBOOK_PREFIX) => {

if let Err(e) = lp_ordermatch::handle_orderbook_msg(

ctx.clone(),

&message.topic,

peer_id.to_string(),

&message.data,

i_am_relay,

)

.await

{

if e.get_inner().is_warning() {

log::warn!("{}", e);

} else {

log::error!("{}", e);

}

return;

}

to_propagate = true;

},

Some(lp_swap::SWAP_PREFIX) => {

if let Err(e) =

lp_swap::process_swap_msg(ctx.clone(), split.next().unwrap_or_default(), &message.data).await

You added version field in Negotiation msg of legacy swap topic, which belongs to SWAP_PREFIX.
But when we change all p2p messages version, it means we need to create a new topic, what we actually did for SWAP_V2_PREFIX

I dont get why we would need version inside the "swap" msg topic. to be able to version this specific topic?

At first place, I needed anything like 'remote peer version' to activate features like 'eip1559 tx' or 'burn non-kmd output' (we need to know if the remote swap party has sufficient version to support such features)

removed version from negotiation e4e8de0

mm2src/coins/solana.rs

mm2src/coins/solana/spl.rs

mariocynicys

Thanks! Huge PR!
had to cut the review short to push out my pending comments and Qs. more iterations to come.

mm2src/coins/tendermint/tendermint_coin.rs

mm2src/coins/utxo/qtum.rs

mariocynicys · 2025-01-20T20:22:54Z

mm2src/coins/utxo/utxo_common.rs

+                - tx_fee;
+            // taker also adds maker output as we can't use SIGHASH_SINGLE with two outputs, dex fee and burn,
+            // and both the maker and taker sign all outputs:
+            outputs.push(TransactionOutput {


i think then we should do the same for the standard non-burn case for simplicity.

im opening a discussion here but this could be done later in another PR ofc.

P.S.: and we don't have to use SIGHASH_ALL for NoFee case. We can actually do SIGHASH_NONE.

I would agree that it's better to do all cases identically (standard will be eliminated eventually though).
Not sure about SIGHASH_NONE: this actually contradict the first idea - do all cases same way

mariocynicys · 2025-01-24T19:09:05Z

mm2src/coins/lp_coins.rs

+/// Calculates DEX fee with a threshold based on min tx amount of the taker coin.
+/// preburn_account_active param indicates that swap nodes version supports burning dex fee for non kmd coins.
+/// It could be None if dex fee is needed only to get total dex fee amount
+/// taker_pubkey also may be optional if it is not known yet but we need total dex fee amount
+pub fn dex_fee_from_taker_coin(
+    taker_coin: &dyn MmCoin,
+    maker_coin: &str,
+    trade_amount: &MmNumber,
+    taker_pubkey: Option<&[u8]>,
+    preburn_account_active: Option<bool>,
+) -> DexFee {
+    DexFee::new_from_taker_coin(
+        taker_coin.deref(),
+        maker_coin,
+        trade_amount,
+        taker_pubkey,
+        preburn_account_active,
+    )
+}


i see in eth we have fn should_burn_dex_fee(&self) -> bool { false } which is false i think because we don't maintain an eth burn account, no?

if so, the param preburn_account_active is confusing as it describes the same thing. i think it should be swap_supports_burning or something, as this is how it's used.

another thing: Option<bool> almost certainly could always be reduced to bool with defaulting the None case to either true or false. If the None case is needed here we can turn this Option<bool> into an enum instead.

preburn_account_active is removed (it was meant to denote that version is high enough to activate the burn feature)

mariocynicys · 2025-01-24T19:26:41Z

mm2src/coins/z_coin.rs

+    println!("ZOMBIE_wallet.db will be synch'ed with the chain, this may take a while for the first time.");
+    println!("You may also run prepare_zombie_sapling_cache test to update ZOMBIE_wallet.db before running tests.");


let's use our logging system here

well it's a hint for the user that this test may take some time (logs may be captured and not being watched atm)
It's meant to be read from console.

mariocynicys · 2025-01-24T19:33:15Z

mm2src/coins/z_coin.rs

+        let mut fee_output_valid = false;
+        let mut burn_output_valid = false;
        for shielded_out in z_tx.shielded_outputs.iter() {
-            if let Some((note, address, memo)) =
-                try_sapling_output_recovery(self.consensus_params_ref(), block_height, &DEX_FEE_OVK, shielded_out)
+            if self
+                .validate_dex_fee_output(
+                    shielded_out,
+                    &DEX_FEE_OVK,
+                    &self.z_fields.dex_fee_addr,
+                    block_height,
+                    fee_amount_sat,
+                    &expected_memo,
+                )
+                .map_err(|err| {
+                    MmError::new(ValidatePaymentError::WrongPaymentTx(format!(
+                        "Bad dex fee output: {}",
+                        err
+                    )))
+                })?
            {
-                if address != self.z_fields.dex_fee_addr {
-                    let encoded = encode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, &address);
-                    let expected = encode_payment_address(
-                        z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS,
-                        &self.z_fields.dex_fee_addr,
-                    );
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee was sent to the invalid address {}, expected {}",
-                        encoded, expected
-                    )));
-                }
-
-                if note.value != amount_sat {
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee has invalid amount {}, expected {}",
-                        note.value, amount_sat
-                    )));
-                }
-
-                if memo != expected_memo {
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee has invalid memo {:?}, expected {:?}",
-                        memo, expected_memo
-                    )));
+                fee_output_valid = true;
+            }
+            if let Some(burn_amount_sat) = burn_amount_sat {
+                if self
+                    .validate_dex_fee_output(
+                        shielded_out,
+                        &DEX_FEE_OVK,
+                        &self.z_fields.dex_burn_addr,
+                        block_height,
+                        burn_amount_sat,
+                        &expected_memo,
+                    )
+                    .map_err(|err| {
+                        MmError::new(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Bad burn output: {}",
+                            err
+                        )))
+                    })?
+                {
+                    burn_output_valid = true;


are we doing this loop and true/false flags because we don't know which order the outputs are? like which is the dex fee and which is the burn?

yes, I believe such code looks more universal than simply rely on the output order

mariocynicys · 2025-01-24T20:14:00Z

mm2src/mm2_main/src/lp_network.rs

@@ -39,7 +39,8 @@ use mm2_metrics::{mm_label, mm_timing};
 use serde::de;
 use std::net::ToSocketAddrs;

-use crate::{lp_healthcheck, lp_ordermatch, lp_stats, lp_swap};
+use crate::{lp_healthcheck, lp_ordermatch, lp_stats,
+            lp_swap::{self}};


no need for self, lp_swap is enough

fixed in latest commits

mariocynicys · 2025-01-24T20:22:30Z

mm2src/mm2_main/src/lp_swap.rs

+/// Add refund fee to calculate maximum available balance for a swap (including possible refund)
+pub(crate) const INCLUDE_REFUND_FEE: bool = true;
+
+/// Do not add refund fee to calculate fee needed only to make a successful swap
+pub(crate) const NO_REFUND_FEE: bool = false;


Q, when are each used and why?

Both are part of same entity, meaning to include or not the refund fee into the return value.
Does it look confusing?
Idea was to use a named const instead of just true or false.

nah, that's not what I meant.

I just ran out of time and decided to ask when each case is used instead of digging in the code 😂

I'm asking here when do we use the fee calcs with refund in mind and when do we use it without considering a possible refund. and why would we use each in such cases.

Ah I see,
true is when we calc max amount avail for swap (with fees required for the worst case of refund)
false - when we show to user required fees (considering swap will be successful and we won't need refund)

borngraced

last notes

mm2src/coins/utxo/utxo_common.rs

borngraced · 2025-02-03T11:04:21Z

mm2src/coins/z_coin.rs

+            if self
+                .validate_dex_fee_output(
+                    shielded_out,
+                    &DEX_FEE_OVK,
+                    &self.z_fields.dex_fee_addr,
+                    block_height,
+                    fee_amount_sat,
+                    &expected_memo,
+                )
+                .map_err(|err| {
+                    MmError::new(ValidatePaymentError::WrongPaymentTx(format!(
+                        "Bad dex fee output: {}",
+                        err
+                    )))
+                })?
            {
-                if address != self.z_fields.dex_fee_addr {
-                    let encoded = encode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, &address);
-                    let expected = encode_payment_address(
-                        z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS,
-                        &self.z_fields.dex_fee_addr,
-                    );
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee was sent to the invalid address {}, expected {}",
-                        encoded, expected
-                    )));
-                }
-
-                if note.value != amount_sat {
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee has invalid amount {}, expected {}",
-                        note.value, amount_sat
-                    )));
-                }
-
-                if memo != expected_memo {
-                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
-                        "Dex fee has invalid memo {:?}, expected {:?}",
-                        memo, expected_memo
-                    )));
+                fee_output_valid = true;
+            }
+            if let Some(burn_amount_sat) = burn_amount_sat {
+                if self
+                    .validate_dex_fee_output(
+                        shielded_out,
+                        &DEX_FEE_OVK,
+                        &self.z_fields.dex_burn_addr,
+                        block_height,
+                        burn_amount_sat,
+                        &expected_memo,
+                    )
+                    .map_err(|err| {
+                        MmError::new(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Bad burn output: {}",
+                            err
+                        )))
+                    })?
+                {
+                    burn_output_valid = true;


I think if statement is not need just assign directly e.g

fee_output_valid = self .validate_dex_fee_output( shielded_out, &DEX_FEE_OVK, &self.z_fields.dex_fee_addr, block_height, fee_amount_sat, &expected_memo, ) .map_err(|err| { MmError::new(ValidatePaymentError::WrongPaymentTx(format!( "Bad dex fee output: {}", err ))) })?;

same with burn_output_valid

I re-worked validate_fee for z_coin: eliminated loop and used fixed 0 and 1 positions for dexfee and burn outputs (like in utxo)

Sorry returned the loop back :-)
Forgot we can't assume zcoin outputs ordering - they are shuffled
@borngraced

borngraced · 2025-02-03T11:08:53Z

mm2src/coins/z_coin.rs

+        let fee_amount_sat = validate_fee_args.dex_fee.fee_amount_as_u64(self.utxo_arc.decimals)?;
+        let burn_amount_sat = validate_fee_args.dex_fee.burn_amount_as_u64(self.utxo_arc.decimals)?;
        let expected_memo = MemoBytes::from_bytes(validate_fee_args.uuid).expect("Uuid length < 512");


Can we check if z_tx.shielded_outputs.is_empty() and return early error before performing these operations.

Do we really need this?
If there is no shielded_outputs or less than expected, we would have one of fee_output_valid or burn_output_valid false. Looks like an extra check for me

…eck added

laruh · 2025-02-04T10:24:30Z

@dimxy pr started to have conflicts. pinging you just to be sure

* dev: fix(hash-types): remove panic, enforce fixed-size arrays (#2279) fix(ARRR): store unconfirmed change output (#2276) feat(tendermint): staking/delegation (#2322) chore(deps): `timed-map` migration (#2247) fix(mem-leak): `running_swap` never shrinks (#2301) chore(dep-bump): libp2p (#2326) refactor(build script): rewrite the main build script (#2319)

dimxy · 2025-02-04T16:16:24Z

Plz note: some zcoin tests (zombie_coin_send_dex_fee) fail until #2331 merged

dimxy added 9 commits April 27, 2024 14:33

make mockable optional

f3625e5

add support for utxo coin burn account to dex fee

d3f843d

remove left over dup dex_fee_rate()

7894f7d

fix coins crate mocktopus dependency for mm2_main crate tests

2984c67

fix dex fee changed due to new burn output in couple of lp_swap tests

128c4b4

fix is_kmd in TestCoin

fix swap v2 test non-kmd burn output

23f2a08

fix fmt

2c810b0

remove comment

af45b71

dimxy changed the title ~~Add utxo burn output for non-kmd taker fee~~ feat(utxo-swap): add utxo burn output for non-kmd taker fee May 6, 2024

dimxy added in progress and removed in progress labels May 6, 2024

dimxy assigned shamardy May 19, 2024

Merge branch 'dev' into burn-dex-fee-for-non-kmd

0f34d2e

* dev: feat(ETH): eip1559 gas fee estimator and rpcs (#2051) fix(p2pk-tests): fix p2pk tests post merge (#2119) fix(p2pk): show and spend P2PK balance (#2053) fix(swap): use tmp file for swap and order files (#2118)

dimxy added in progress and removed under review labels Jun 9, 2024

dimxy added 9 commits June 14, 2024 20:54

fix zombie chain scan block num

d53dc37

fix zhtlc send and spend tests

add burn output for privacy coin,

81263e0

add should_burn_dex_fee method to indicate which coin has burn output

use custom log! instead debug! (as env_logger disabled) in qrc20 dock…

9331e40

…er test add timeout in wait for fee in qrc20 docker test

fix to make should_burn_dex_fee explicitly in each coin (to fix qrc20…

b343275

… docker test failed due to different dex fee values if trait default impl was used)

restore original test log message

587b1ae

add test for std dex fee for zcoin

58d84cf

remove unused cache dir var in z_coin init block

1243935

fix clippy

bc00ee8

laruh requested changes Jun 18, 2024

View reviewed changes

dimxy added 2 commits June 19, 2024 13:05

fix burn addr in ZOutput

4d59545

use same ovk for dex fee and burn outputs

refactor dex fee code;

dc9e710

add sanity check for dex_fee in calc_burn_amount_for_op_return

borngraced requested changes Jan 20, 2025

View reviewed changes

dimxy added 2 commits January 20, 2025 21:27

remove old comment

9a801c2

remove unused code to broadcast multiple msgs

ab96ba8

dimxy commented Jan 20, 2025

View reviewed changes

laruh requested changes Jan 21, 2025

View reviewed changes

laruh reviewed Jan 21, 2025

View reviewed changes

mm2src/coins/solana.rs Outdated Show resolved Hide resolved

laruh reviewed Jan 21, 2025

View reviewed changes

mm2src/coins/solana/spl.rs Outdated Show resolved Hide resolved

dimxy added 2 commits January 21, 2025 21:13

fix after merge (remove solana src)

bbe2b5b

refactor (laruh): rename version fields

897aa4d

mariocynicys reviewed Jan 24, 2025

View reviewed changes

dimxy added 5 commits January 27, 2025 16:25

remove negotiation msg version (to be impl in a different way)

e4e8de0

remove unused features

0b37b10

refactor test mock def, removed unused mockable

de4394f

cargo fmt

af3762b

add test helper (mariocynicys)

de079ba

shamardy added the 2.4.0-beta label Feb 3, 2025

shamardy requested review from shamardy, borngraced, laruh and mariocynicys February 3, 2025 09:52

borngraced requested changes Feb 3, 2025

View reviewed changes

dimxy added 2 commits February 3, 2025 23:22

review (borngraced): dex fee errors improved, make value underflow ch…

a505386

…eck added

review (mariocynicys): refactor dex fee dust handling

019209f

dimxy added 5 commits February 4, 2025 15:40

review (borngraced): use as_ref for tendermint address

d7e18d4

review (mariocynicys): add dex_address, burn_address fn for utxo

30a13fa

add flavor multithread to zcoin tests

4b1b867

update zcoin txns for real dex and burn address

1dcb774

		#[cfg(feature = "for-tests")]
		pub static mut TEST_BURN_ADDR_RAW_PUBKEY: Option<Vec<u8>> = None;

		/// Swap message exchange version supported by remote taker peer. Optional because it is found at negotiation
		pub taker_version: Option<u16>,

	let mut split = message.topic.as_str().split(TOPIC_SEPARATOR);
	match split.next() {
	Some(lp_ordermatch::ORDERBOOK_PREFIX) => {
	if let Err(e) = lp_ordermatch::handle_orderbook_msg(
	ctx.clone(),
	&message.topic,
	peer_id.to_string(),
	&message.data,
	i_am_relay,
	)
	.await
	{
	if e.get_inner().is_warning() {
	log::warn!("{}", e);
	} else {
	log::error!("{}", e);
	}
	return;
	}

	to_propagate = true;
	},
	Some(lp_swap::SWAP_PREFIX) => {
	if let Err(e) =
	lp_swap::process_swap_msg(ctx.clone(), split.next().unwrap_or_default(), &message.data).await

		println!("ZOMBIE_wallet.db will be synch'ed with the chain, this may take a while for the first time.");
		println!("You may also run prepare_zombie_sapling_cache test to update ZOMBIE_wallet.db before running tests.");

feat(utxo-swap): add utxo burn output for non-kmd taker fee #2112

Are you sure you want to change the base?

feat(utxo-swap): add utxo burn output for non-kmd taker fee #2112

Conversation

dimxy commented May 6, 2024 • edited Loading

laruh left a comment

Choose a reason for hiding this comment

borngraced left a comment

Choose a reason for hiding this comment

borngraced Jan 20, 2025 • 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laruh Jan 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laruh left a 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

laruh Jan 22, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mariocynicys left a 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

dimxy Jan 27, 2025 • 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

borngraced left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dimxy Feb 3, 2025 • 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

laruh commented Feb 4, 2025

dimxy commented Feb 4, 2025

dimxy commented May 6, 2024 •

edited

Loading

borngraced Jan 20, 2025 •

edited

Loading

laruh Jan 21, 2025 •

edited

Loading

laruh Jan 22, 2025 •

edited

Loading

dimxy Jan 27, 2025 •

edited

Loading

dimxy Feb 3, 2025 •

edited

Loading