fix remove stealth

tari-project · Jun 25, 2024 · bf3bea5 · bf3bea5
1 parent 5b233c9
commit bf3bea5
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/applications/minotari_merge_mining_proxy/src/block_template_protocol.rs b/applications/minotari_merge_mining_proxy/src/block_template_protocol.rs
@@ -335,7 +335,7 @@ impl BlockTemplateProtocol<'_> {
             self.config.coinbase_extra.as_bytes(),
             &self.key_manager,
             &self.wallet_payment_address,
-            self.config.stealth_payment,
+            true,
             self.consensus_manager.consensus_constants(tari_height),
             self.config.range_proof_type,
             PaymentId::Empty,

diff --git a/applications/minotari_merge_mining_proxy/src/config.rs b/applications/minotari_merge_mining_proxy/src/config.rs
@@ -90,8 +90,6 @@ pub struct MergeMiningProxyConfig {
     pub config_dir: PathBuf,
     /// The Tari wallet address (valid address in hex) where the mining funds will be sent to - must be assigned
     pub wallet_payment_address: String,
-    /// Stealth payment yes or no
-    pub stealth_payment: bool,
     /// Range proof type - revealed_value or bullet_proof_plus: (default = revealed_value)
     pub range_proof_type: RangeProofType,
 }
@@ -119,7 +117,6 @@ impl Default for MergeMiningProxyConfig {
             network: Default::default(),
             config_dir: PathBuf::from("config/merge_mining_proxy"),
             wallet_payment_address: TariAddress::default().to_base58(),
-            stealth_payment: true,
             range_proof_type: RangeProofType::RevealedValue,
         }
     }

diff --git a/applications/minotari_miner/README.md b/applications/minotari_miner/README.md
@@ -33,7 +33,6 @@ Configuration options for the Minotari Miner are as follows:
 - `network` - "Selected network"
 - `wait_timeout_on_error` - "Base node reconnect timeout after any gRPC or miner error"
 - `wallet_payment_address` - "The Tari wallet address where the mining funds will be sent to"
-- `stealth_payment` - "Stealth payment yes or no"
 
 ### Caveats
 

diff --git a/common/config/presets/f_merge_mining_proxy.toml b/common/config/presets/f_merge_mining_proxy.toml
@@ -85,7 +85,5 @@ monerod_url = [ # mainnet
 # The Tari wallet address (valid address in hex) where the mining funds will be sent to - must be assigned
 # e.g. "78e724f466d202abdee0f23c261289074e4a2fc9eb61e83e0179eead76ce2d3f17"
 #wallet_payment_address = "YOUR_WALLET_TARI_ADDRESS"
-# Stealth payment yes or no (default: true)
-#stealth_payment = true
 # Range proof type - revealed_value or bullet_proof_plus: (default = "revealed_value")
 #range_proof_type = "revealed_value"
diff --git a/integration_tests/src/merge_mining_proxy.rs b/integration_tests/src/merge_mining_proxy.rs
@@ -43,7 +43,6 @@ pub struct MergeMiningProxyProcess {
     pub port: u64,
     pub origin_submission: bool,
     id: u64,
-    pub stealth: bool,
 }
 
 pub async fn register_merge_mining_proxy_process(
@@ -52,7 +51,6 @@ pub async fn register_merge_mining_proxy_process(
     base_node_name: String,
     wallet_name: String,
     origin_submission: bool,
-    stealth: bool,
 ) {
     let merge_mining_proxy = MergeMiningProxyProcess {
         name: merge_mining_proxy_name.clone(),
@@ -61,7 +59,6 @@ pub async fn register_merge_mining_proxy_process(
         port: get_port(18000..18499).unwrap(),
         origin_submission,
         id: 0,
-        stealth,
     };
 
     merge_mining_proxy.start(world).await;
@@ -93,7 +90,6 @@ impl MergeMiningProxyProcess {
             .into_inner()
             .address;
         let wallet_payment_address = TariAddress::from_bytes(wallet_public_key).unwrap();
-        let stealth = self.stealth;
         thread::spawn(move || {
             let cli = Cli {
                 common: CommonCliArgs {
@@ -134,7 +130,6 @@ impl MergeMiningProxyProcess {
                             "merge_mining_proxy.wallet_payment_address".to_string(),
                             wallet_payment_address.to_base58(),
                         ),
-                        ("merge_mining_proxy.stealth_payment".to_string(), stealth.to_string()),
                         (
                             "merge_mining_proxy.use_dynamic_fail_data".to_string(),
                             "false".to_string(),

diff --git a/integration_tests/src/miner.rs b/integration_tests/src/miner.rs
@@ -129,7 +129,6 @@ impl MinerProcess {
                         "miner.wallet_payment_address".to_string(),
                         wallet_payment_address.to_base58(),
                     ),
-                    ("miner.stealth_payment".to_string(), self.stealth.to_string()),
                 ],
                 network: Some(Network::LocalNet),
             },

diff --git a/integration_tests/tests/steps/merge_mining_steps.rs b/integration_tests/tests/steps/merge_mining_steps.rs
@@ -38,7 +38,7 @@ async fn merge_mining_proxy_with_submission(
         "disabled" => false,
         _ => panic!("This should be a boolean"),
     };
-    register_merge_mining_proxy_process(world, mining_proxy_name, base_node_name, wallet_name, enabled, true).await;
+    register_merge_mining_proxy_process(world, mining_proxy_name, base_node_name, wallet_name, enabled).await;
 }
 
 #[when(expr = "I have a merge mining proxy {word} connected to {word} and {word} with default config")]
@@ -48,7 +48,7 @@ async fn merge_mining_proxy_with_default_config(
     base_node_name: String,
     wallet_name: String,
 ) {
-    register_merge_mining_proxy_process(world, mining_proxy_name, base_node_name, wallet_name, true, false).await;
+    register_merge_mining_proxy_process(world, mining_proxy_name, base_node_name, wallet_name, true).await;
 }
 
 #[when(expr = "I ask for a block height from proxy {word}")]