feat: enable revealed-value proofs

applications/minotari_app_grpc/proto/types.proto

@@ -98,6 +98,11 @@ enum RangeProofType {
     REVEALED_VALUE = 1;
 }
 
+message PermittedRangeProofs {
+    OutputType output_type = 1;
+    repeated RangeProofType range_proof_types = 2;
+}
+
 /// Range proof
 message RangeProof {
     bytes proof_bytes = 1;
@@ -135,5 +140,5 @@ message ConsensusConstants {
     uint64 validator_node_registration_min_deposit_amount = 31;
     uint64 validator_node_registration_min_lock_height = 32;
     uint64 validator_node_registration_shuffle_interval_epoch = 33;
-    repeated RangeProofType permitted_range_proof_types = 34;
+    repeated PermittedRangeProofs permitted_range_proof_types = 34;
 }

applications/minotari_app_grpc/src/conversions/consensus_constants.rs

@@ -75,11 +75,16 @@ impl From<ConsensusConstants> for grpc::ConsensusConstants {
             .map(|ot| i32::from(ot.as_byte()))
             .collect::<Vec<i32>>();
 
-        let permitted_range_proof_types = cc.permitted_range_proof_types();
-        let permitted_range_proof_types = permitted_range_proof_types
-            .iter()
-            .map(|rpt| i32::from(rpt.as_byte()))
-            .collect::<Vec<i32>>();
+        let mut permitted_range_proof_types = Vec::with_capacity(cc.permitted_range_proof_types().len());
+        for (output_type, range_proof_types) in cc.permitted_range_proof_types() {
+            permitted_range_proof_types.push(grpc::PermittedRangeProofs {
+                output_type: i32::from(output_type.as_byte()),
+                range_proof_types: range_proof_types
+                    .iter()
+                    .map(|rpt| i32::from(rpt.as_byte()))
+                    .collect::<Vec<i32>>(),
+            });
+        }
 
         let randomx_pow = grpc::PowAlgorithmConstants {
             max_difficulty: cc.max_pow_difficulty(PowAlgorithm::RandomX).as_u64(),

applications/minotari_merge_mining_proxy/src/block_template_protocol.rs

@@ -215,6 +215,7 @@ impl BlockTemplateProtocol<'_> {
             &self.wallet_payment_address,
             self.config.stealth_payment,
             self.consensus_manager.consensus_constants(tari_height),
+            self.config.range_proof_type,
         )
         .await?;
         Ok((coinbase_output, coinbase_kernel))

applications/minotari_merge_mining_proxy/src/config.rs

@@ -28,6 +28,7 @@ use tari_common::{
 };
 use tari_common_types::tari_address::TariAddress;
 use tari_comms::multiaddr::Multiaddr;
+use tari_core::transactions::transaction_components::RangeProofType;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
@@ -72,6 +73,8 @@ pub struct MergeMiningProxyConfig {
     pub wallet_payment_address: String,
     /// Stealth payment yes or no
     pub stealth_payment: bool,
+    /// Range proof type - revealed_value or bullet_proof_plus: (default = bullet_proof_plus)
+    pub range_proof_type: RangeProofType,
 }
 
 impl Default for MergeMiningProxyConfig {
@@ -93,6 +96,7 @@ impl Default for MergeMiningProxyConfig {
             network: Default::default(),
             wallet_payment_address: TariAddress::default().to_hex(),
             stealth_payment: true,
+            range_proof_type: RangeProofType::BulletProofPlus,
         }
     }
 }

applications/minotari_miner/src/config.rs

@@ -41,6 +41,7 @@ use serde::{Deserialize, Serialize};
 use tari_common::{configuration::Network, SubConfigPath};
 use tari_common_types::{grpc_authentication::GrpcAuthentication, tari_address::TariAddress};
 use tari_comms::multiaddr::Multiaddr;
+use tari_core::transactions::transaction_components::RangeProofType;
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(deny_unknown_fields)]
@@ -77,6 +78,8 @@ pub struct MinerConfig {
     pub wallet_payment_address: String,
     /// Stealth payment yes or no
     pub stealth_payment: bool,
+    /// Range proof type - revealed_value or bullet_proof_plus: (default = bullet_proof_plus)
+    pub range_proof_type: RangeProofType,
 }
 
 /// The proof of work data structure that is included in the block header. For the Minotari miner only `Sha3x` is
@@ -110,6 +113,7 @@ impl Default for MinerConfig {
             wait_timeout_on_error: 10,
             wallet_payment_address: TariAddress::default().to_hex(),
             stealth_payment: true,
+            range_proof_type: RangeProofType::BulletProofPlus,
         }
     }
 }

applications/minotari_miner/src/run_miner.rs

@@ -287,6 +287,7 @@ async fn mining_cycle(
         wallet_payment_address,
         config.stealth_payment,
         consensus_manager.consensus_constants(height),
+        config.range_proof_type,
     )
     .await
     .map_err(|e| MinerError::CoinbaseError(e.to_string()))?;

applications/minotari_node/src/config.rs

@@ -273,14 +273,16 @@ mod tests {
 
     #[test]
     fn it_deserializes_enums() {
-        let config_str = r#"name = "blockchain champion"
-                inner_config.deny_methods = [
-                    "list_headers",
-                    "get_constants",
-            #        "get_blocks"
-                    "identify",
-            #        "get_shard_key"
-                ]"#;
+        let config_str = r#"
+            name = "blockchain champion"
+            inner_config.deny_methods = [
+                "list_headers",
+                "get_constants",
+            #    "get_blocks"
+                "identify",
+            #    "get_shard_key"
+            ]
+        "#;
         let config = toml::from_str::<TestConfig>(config_str).unwrap();
 
         // Enums in the config

base_layer/core/Cargo.toml

@@ -86,6 +86,7 @@ libsqlite3-sys = { version = "0.25.1", features = ["bundled"] }
 config = { version = "0.13.0" }
 env_logger = "0.7.0"
 tempfile = "3.1.0"
+toml = { version = "0.5" }
 
 [build-dependencies]
 tari_common = {  path = "../../common", features = ["build"] }