ci: build dockers test

Cargo.toml

@@ -1,6 +1,6 @@
 # NOTE: When editing this version, also edit the versions in template_built_in/templates/account and account_nft
 [workspace.package]
-version = "0.5.1"
+version = "0.5.2"
 edition = "2021"
 authors = ["The Tari Development Community"]
 repository = "https://github.com/tari-project/tari-dan"

applications/tari_generate/src/main.rs

@@ -88,7 +88,7 @@ struct ScaffoldArgs {
     #[clap(long, short = 'c', alias = "config")]
     pub generator_config_file: Option<PathBuf>,
     #[clap(long, short = 'a')]
-    address: String,
+    template_address: String,
     #[clap(long, short = 'j')]
     dan_testing_jrpc_url: String,
 }
@@ -284,7 +284,7 @@ async fn scaffold(args: ScaffoldArgs) -> anyhow::Result<()> {
         output_path: "output/".into(),
         liquid: Some(generators::LiquidGeneratorOpts {
             skip_format: false,
-            variables: vec![("template_address".to_string(), Value::String(args.address.clone()))]
+            variables: vec![("template_address".to_string(), Value::String(args.template_address.clone()))]
                 .into_iter()
                 .collect(),
         }),
@@ -307,7 +307,7 @@ async fn scaffold(args: ScaffoldArgs) -> anyhow::Result<()> {
     let request = json!({
         "jsonrpc" : "2.0",
         "method": "get_template",
-        "params": [hex::decode(args.address)?],
+        "params": [hex::decode(args.template_address)?],
         "id": 1
     });
     let response = reqwest::Client::new()

applications/tari_indexer/log4rs_sample.yml

@@ -106,12 +106,16 @@ loggers:
       - stdout
     additive: false
 
+  tari::dan::networking:
+    level: debug
+    appenders:
+      - network
+    additive: true
+
   tari::dan:
     level: info
     appenders:
       - dan_layer
-      - stdout
-    additive: false
 
   tari::indexer:
     level: info

dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs

@@ -151,7 +151,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
             }
 
             let Some((valid_block, tree_diff)) =
-                self.validate_block(tx, block, &local_committee, &local_committee_shard)?
+                self.validate_block_header(tx, block, &local_committee, &local_committee_shard)?
             else {
                 return Ok(None);
             };
@@ -191,7 +191,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
         Ok(high_qc)
     }
 
-    fn validate_block(
+    fn validate_block_header(
         &self,
         tx: &mut <TConsensusSpec::StateStore as StateStore>::WriteTransaction<'_>,
         block: Block,
@@ -424,6 +424,8 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
         )?;
 
         let justify_block_height = justify_block.height();
+        // if the block parent is not the justify parent, then we have experienced a leader failure
+        // and should make dummy blocks to fill in the gaps.
         if justify_block.id() != candidate_block.parent() {
             let mut dummy_blocks =
                 Vec::with_capacity((candidate_block.height().as_u64() - justify_block_height.as_u64() - 1) as usize);
@@ -432,8 +434,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
             let base_layer_block_hash = *justify_block.base_layer_block_hash();
             dummy_blocks.push(justify_block);
             let mut last_dummy_block = dummy_blocks.last().unwrap();
-            // if the block parent is not the justify parent, then we have experienced a leader failure
-            // and should make dummy blocks to fill in the gaps.
+
             while last_dummy_block.id() != candidate_block.parent() {
                 if last_dummy_block.height() > candidate_block.height() {
                     warn!(target: LOG_TARGET, "🔥 Bad proposal, dummy block height {} is greater than new height {}", last_dummy_block, candidate_block);

dan_layer/epoch_manager/src/base_layer/epoch_manager_service.rs

@@ -102,7 +102,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey + 'static>
 
     #[allow(clippy::too_many_lines)]
     async fn handle_request(&mut self, req: EpochManagerRequest<TAddr>) {
-        info!(target: LOG_TARGET, "Received request: {:?}", req);
+        debug!(target: LOG_TARGET, "Received request: {:?}", req);
         match req {
             EpochManagerRequest::CurrentEpoch { reply } => handle(reply, Ok(self.inner.current_epoch())),
             EpochManagerRequest::CurrentBlockInfo { reply } => handle(reply, Ok(self.inner.current_block_info())),

docker_rig/tari-dan.Dockerfile

@@ -43,6 +43,7 @@ RUN apt-get update && apt-get install -y \
       libsqlite3-0 \
       openssl \
       cmake \
+      protobuf-compiler \
       nodejs
 
 # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html

networking/core/src/worker.rs

@@ -520,6 +520,7 @@ where
                     relay_peer_id, renewal, limit
                 );
             },
+
             RelayClient(event) => {
                 info!(target: LOG_TARGET, "🌎️ RelayClient event: {:?}", event);
             },
@@ -921,7 +922,7 @@ where
                 let _ignore = reply.send(Ok(NegotiatedSubstream::new(peer_id, protocol, stream)));
             },
             InboundSubstreamOpen { notification } => {
-                info!(target: LOG_TARGET, "📥 Inbound substream open: protocol={}", notification.protocol);
+                debug!(target: LOG_TARGET, "📥 Inbound substream open: protocol={}", notification.protocol);
                 self.substream_notifiers.notify(notification);
             },
             InboundFailure {

networking/rpc_framework/src/server/mod.rs

@@ -368,7 +368,7 @@ where
     }
 
     fn on_session_complete(&mut self, node_id: &PeerId) {
-        info!(target: LOG_TARGET, "Session complete for {}", node_id);
+        debug!(target: LOG_TARGET, "Session complete for {}", node_id);
         if let Some(v) = self.sessions.get_mut(node_id) {
             *v -= 1;
             if *v == 0 {
@@ -416,7 +416,7 @@ where
 
         match self.new_session_for(peer_id) {
             Ok(num_sessions) => {
-                info!(
+                debug!(
                     target: LOG_TARGET,
                     "NEW SESSION for {} ({} active) ", peer_id, num_sessions
                 );
@@ -446,7 +446,7 @@ where
                 #[cfg(feature = "metrics")]
                 num_sessions.inc();
                 service.start().await;
-                info!(target: LOG_TARGET, "END OF SESSION for {} ", peer_id,);
+                debug!(target: LOG_TARGET, "END OF SESSION for {} ", peer_id,);
                 #[cfg(feature = "metrics")]
                 num_sessions.dec();