implementation done

Cargo.toml

@@ -4,12 +4,19 @@ version = "0.1.8"
 edition = "2021"
 
 [dependencies]
-minotari_app_grpc = { git = "https://github.com/tari-project/tari.git" }
-minotari_node_grpc_client = { git = "https://github.com/tari-project/tari.git" }
-tari_common_types = { git = "https://github.com/tari-project/tari.git" }
-tari_common = { git = "https://github.com/tari-project/tari.git" }
-tari_core = { git = "https://github.com/tari-project/tari.git" }
-tari_shutdown = { git = "https://github.com/tari-project/tari.git" }
+#minotari_app_grpc = { git = "https://github.com/tari-project/tari.git" }
+#minotari_node_grpc_client = { git = "https://github.com/tari-project/tari.git" }
+#tari_common_types = { git = "https://github.com/tari-project/tari.git" }
+#tari_common = { git = "https://github.com/tari-project/tari.git" }
+#tari_core = { git = "https://github.com/tari-project/tari.git" }
+#tari_shutdown = { git = "https://github.com/tari-project/tari.git" }
+
+minotari_app_grpc = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
+minotari_node_grpc_client = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
+tari_common_types = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
+tari_common = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
+tari_core = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
+tari_shutdown = { git = "https://github.com/ksrichard/tari.git", branch = "feature/p2pool-coinbase-extra" }
 
 tari_crypto = "0.20.1"
 tari_utilities = { version = "0.7", features = ["borsh"] }

src/cli/commands/util.rs

@@ -1,7 +1,7 @@
 // Copyright 2024 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use std::{env, sync::Arc};
+use std::{collections::HashMap, env, sync::Arc};
 
 use libp2p::identity::Keypair;
 use log::info;
@@ -12,6 +12,7 @@ use tari_core::{
 };
 use tari_shutdown::ShutdownSignal;
 use tari_utilities::hex::Hex;
+use tokio::sync::RwLock;
 
 use crate::{
     cli::args::{Cli, StartArgs},
@@ -99,14 +100,28 @@ genesis_block_hash.to_hex());
         consensus_manager.clone(),
         genesis_block_hash,
     ));
-    let share_chain_sha3x =
-        InMemoryShareChain::new(MAX_BLOCKS_COUNT, PowAlgorithm::Sha3x, None, consensus_manager.clone())?;
+    let coinbase_extras = Arc::new(RwLock::new(HashMap::<String, Vec<u8>>::new()));
+    let share_chain_sha3x = InMemoryShareChain::new(
+        MAX_BLOCKS_COUNT,
+        PowAlgorithm::Sha3x,
+        None,
+        consensus_manager.clone(),
+        coinbase_extras.clone(),
+    )?;
     let share_chain_random_x = InMemoryShareChain::new(
         MAX_BLOCKS_COUNT,
         PowAlgorithm::RandomX,
         Some(block_validation_params.clone()),
         consensus_manager,
+        coinbase_extras.clone(),
     )?;
 
-    Ok(Server::new(config, share_chain_sha3x, share_chain_random_x, shutdown_signal).await?)
+    Ok(Server::new(
+        config,
+        share_chain_sha3x,
+        share_chain_random_x,
+        coinbase_extras.clone(),
+        shutdown_signal,
+    )
+    .await?)
 }

src/server/grpc/p2pool.rs

@@ -1,7 +1,7 @@
 // Copyright 2024 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use std::{collections::HashMap, sync::Arc, time::Instant};
+use std::{collections::HashMap, str::FromStr, sync::Arc, time::Instant};
 
 use log::{debug, error, info, warn};
 use minotari_app_grpc::tari_rpc::{
@@ -16,7 +16,7 @@ use minotari_app_grpc::tari_rpc::{
     SubmitBlockResponse,
 };
 use num_format::{Locale, ToFormattedString};
-use tari_common_types::types::FixedHash;
+use tari_common_types::{tari_address::TariAddress, types::FixedHash};
 use tari_core::{
     consensus::ConsensusManager,
     proof_of_work::{randomx_difficulty, randomx_factory::RandomXFactory, sha3x_difficulty, Difficulty, PowAlgorithm},
@@ -37,6 +37,7 @@ use crate::{
             P2POOL_STAT_REJECTED_BLOCKS_COUNT,
         },
         p2p,
+        p2p::Tribe,
         stats_store::StatsStore,
     },
     sharechain::{block::Block, BlockValidationParams, ShareChain, SHARE_COUNT},
@@ -77,6 +78,8 @@ where S: ShareChain
     stats_max_difficulty_since_last_success: Arc<RwLock<Difficulty>>,
     consensus_manager: ConsensusManager,
     submit_block_semaphore: Arc<Semaphore>,
+    tribe: Tribe,
+    coinbase_extras: Arc<RwLock<HashMap<String, Vec<u8>>>>,
 }
 
 impl<S> ShaP2PoolGrpc<S>
@@ -92,6 +95,8 @@ where S: ShareChain
         random_x_factory: RandomXFactory,
         consensus_manager: ConsensusManager,
         genesis_block_hash: FixedHash,
+        tribe: Tribe,
+        coinbase_extras: Arc<RwLock<HashMap<String, Vec<u8>>>>,
     ) -> Result<Self, Error> {
         Ok(Self {
             client: Arc::new(RwLock::new(
@@ -111,6 +116,8 @@ where S: ShareChain
             stats_max_difficulty_since_last_success: Arc::new(RwLock::new(Difficulty::min())),
             consensus_manager,
             submit_block_semaphore: Arc::new(Semaphore::new(1)),
+            tribe,
+            coinbase_extras: coinbase_extras.clone(),
         })
     }
 
@@ -158,11 +165,10 @@ where S: ShareChain
         request: Request<GetNewBlockRequest>,
     ) -> Result<Response<GetNewBlockResponse>, Status> {
         let timer = Instant::now();
+        let grpc_req = request.into_inner();
+
         // extract pow algo
-        let grpc_block_header_pow = request
-            .into_inner()
-            .pow
-            .ok_or(Status::invalid_argument("missing pow in request"))?;
+        let grpc_block_header_pow = grpc_req.pow.ok_or(Status::invalid_argument("missing pow in request"))?;
         let grpc_pow_algo = PowAlgos::from_i32(grpc_block_header_pow.pow_algo)
             .ok_or_else(|| Status::internal("invalid block header pow algo in request"))?;
         let pow_algo = match grpc_pow_algo {
@@ -187,12 +193,22 @@ where S: ShareChain
             .ok_or_else(|| Status::internal("missing miner data"))?;
         // let reward = miner_data.reward;
 
+        // update coinbase extras cache
+        let wallet_payment_address = TariAddress::from_str(grpc_req.wallet_payment_address.as_str())
+            .map_err(|error| Status::failed_precondition(format!("Invalid wallet payment address:  {}", error)))?;
+        let mut coinbase_extras_lock = self.coinbase_extras.write().await;
+        coinbase_extras_lock.insert(
+            wallet_payment_address.to_base58(),
+            util::convert_coinbase_extra(self.tribe.clone(), grpc_req.coinbase_extra),
+        );
+        drop(coinbase_extras_lock);
+
         // request new block template with shares as coinbases
         let share_chain = match pow_algo {
             PowAlgorithm::RandomX => self.share_chain_random_x.clone(),
             PowAlgorithm::Sha3x => self.share_chain_sha3x.clone(),
         };
-        let shares = share_chain.generate_shares().await;
+        let shares = share_chain.generate_shares(self.tribe.clone()).await;
 
         let mut response = self
             .client
@@ -257,6 +273,7 @@ where S: ShareChain
         if timer.elapsed() > MAX_ACCEPTABLE_GRPC_TIMEOUT {
             warn!(target: LOG_TARGET, "get_new_block took {}ms", timer.elapsed().as_millis());
         }
+
         Ok(Response::new(GetNewBlockResponse {
             block: Some(response),
             target_difficulty: target_difficulty.as_u64(),
@@ -307,7 +324,7 @@ where S: ShareChain
             PowAlgorithm::Sha3x => self.share_chain_sha3x.clone(),
         };
         let mut block = share_chain
-            .new_block(grpc_block)
+            .new_block(grpc_block, self.tribe.clone())
             .await
             .map_err(|error| Status::internal(error.to_string()))?;
 

src/server/grpc/util.rs

@@ -10,7 +10,10 @@ use tari_shutdown::ShutdownSignal;
 use tokio::select;
 use tonic::transport::Channel;
 
-use crate::server::grpc::error::{Error, TonicError};
+use crate::server::{
+    grpc::error::{Error, TonicError},
+    p2p::Tribe,
+};
 
 /// Utility function to connect to a Base node and try infinitely when it fails until gets connected.
 pub async fn connect_base_node(
@@ -49,3 +52,17 @@ pub async fn connect_base_node(
 
     Ok(client)
 }
+
+pub fn convert_coinbase_extra(tribe: Tribe, custom_coinbase_extra: String) -> Vec<u8> {
+    let type_length_value_marker = 0xFFu8;
+    let tribe_type_marker = 0x02u8;
+    let custom_message_type_marker = 0x01u8;
+    let mut current_tribe = tribe.as_string().into_bytes();
+    let mut result = vec![type_length_value_marker, tribe_type_marker, current_tribe.len() as u8];
+    result.append(&mut current_tribe);
+    let mut coinbase_extra_bytes = custom_coinbase_extra.into_bytes();
+    result.append(&mut vec![custom_message_type_marker, coinbase_extra_bytes.len() as u8]);
+    result.append(&mut coinbase_extra_bytes);
+
+    result
+}

src/server/http/stats/handlers.rs

@@ -81,17 +81,25 @@ pub(crate) async fn handle_miners_with_shares(
     let mut result = HashMap::with_capacity(2);
     result.insert(
         PowAlgorithm::Sha3x.to_string().to_lowercase(),
-        state.share_chain_sha3x.miners_with_shares().await.map_err(|error| {
-            error!(target: LOG_TARGET, "Failed to get Sha3x miners with shares: {error:?}");
-            StatusCode::INTERNAL_SERVER_ERROR
-        })?,
+        state
+            .share_chain_sha3x
+            .miners_with_shares(state.tribe.clone())
+            .await
+            .map_err(|error| {
+                error!(target: LOG_TARGET, "Failed to get Sha3x miners with shares: {error:?}");
+                StatusCode::INTERNAL_SERVER_ERROR
+            })?,
     );
     result.insert(
         PowAlgorithm::RandomX.to_string().to_lowercase(),
-        state.share_chain_random_x.miners_with_shares().await.map_err(|error| {
-            error!(target: LOG_TARGET, "Failed to get RandomX miners with shares: {error:?}");
-            StatusCode::INTERNAL_SERVER_ERROR
-        })?,
+        state
+            .share_chain_random_x
+            .miners_with_shares(state.tribe.clone())
+            .await
+            .map_err(|error| {
+                error!(target: LOG_TARGET, "Failed to get RandomX miners with shares: {error:?}");
+                StatusCode::INTERNAL_SERVER_ERROR
+            })?,
     );
 
     if timer.elapsed() > MAX_ACCEPTABLE_HTTP_TIMEOUT {
@@ -140,10 +148,13 @@ async fn get_stats(state: AppState, algo: PowAlgorithm) -> Result<Stats, StatusC
     // connected
     let connected = state.peer_store.peer_count().await > 0;
 
-    let shares = share_chain.miners_with_shares().await.map_err(|error| {
-        error!(target: LOG_TARGET, "Failed to get miners with shares: {error:?}");
-        StatusCode::INTERNAL_SERVER_ERROR
-    })?;
+    let shares = share_chain
+        .miners_with_shares(state.tribe.clone())
+        .await
+        .map_err(|error| {
+            error!(target: LOG_TARGET, "Failed to get miners with shares: {error:?}");
+            StatusCode::INTERNAL_SERVER_ERROR
+        })?;
     // collect number of miners
     // let num_of_miners = chain
     // .iter()

src/server/p2p/network.rs

@@ -111,6 +111,10 @@ impl Tribe {
     pub fn formatted(&self) -> String {
         self.inner.to_case(Case::Lower).replace("_", " ").to_case(Case::Title)
     }
+
+    pub fn as_string(&self) -> String {
+        self.inner.to_case(Case::Lower)
+    }
 }
 
 impl ToValue for Tribe {

src/server/server.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 use std::{
+    collections::HashMap,
     net::{AddrParseError, SocketAddr},
     str::FromStr,
     sync::{atomic::AtomicBool, Arc},
@@ -13,6 +14,7 @@ use tari_common::configuration::Network;
 use tari_core::{consensus::ConsensusManager, proof_of_work::randomx_factory::RandomXFactory};
 use tari_shutdown::ShutdownSignal;
 use thiserror::Error;
+use tokio::sync::RwLock;
 
 use crate::{
     server::{
@@ -60,6 +62,7 @@ where S: ShareChain
         config: config::Config,
         share_chain_sha3x: S,
         share_chain_random_x: S,
+        coinbase_extras: Arc<RwLock<HashMap<String, Vec<u8>>>>,
         shutdown_signal: ShutdownSignal,
     ) -> Result<Self, Error> {
         let share_chain_sha3x = Arc::new(share_chain_sha3x);
@@ -103,6 +106,8 @@ where S: ShareChain
                 randomx_factory,
                 consensus_manager,
                 genesis_block_hash,
+                config.p2p_service.tribe.clone(),
+                coinbase_extras.clone(),
             )
             .await
             .map_err(Error::Grpc)?;

src/sharechain/block.rs

@@ -36,6 +36,7 @@ pub(crate) struct Block {
     pub miner_wallet_address: Option<TariAddress>,
     pub sent_to_main_chain: bool,
     pub achieved_difficulty: Difficulty,
+    pub miner_coinbase_extra: Vec<u8>,
 }
 impl_conversions!(Block);
 
@@ -76,6 +77,7 @@ impl BlockBuilder {
                 miner_wallet_address: Default::default(),
                 sent_to_main_chain: false,
                 achieved_difficulty: Difficulty::min(),
+                miner_coinbase_extra: vec![],
             },
         }
     }
@@ -100,6 +102,11 @@ impl BlockBuilder {
         self
     }
 
+    pub fn with_miner_coinbase_extra(&mut self, coinbase_extra: Vec<u8>) -> &mut Self {
+        self.block.miner_coinbase_extra = coinbase_extra;
+        self
+    }
+
     pub fn with_miner_wallet_address(&mut self, miner_wallet_address: TariAddress) -> &mut Self {
         self.block.miner_wallet_address = Some(miner_wallet_address);
         self