NDRS-157: get block limits from the chainspec

Makefile

@@ -57,16 +57,10 @@ TOOL_TARGET_DIR           = grpc/cargo-casperlabs/target
 TOOL_WASM_DIR             = grpc/cargo-casperlabs/wasm
 
 CRATES_WITH_DOCS_RS_MANIFEST_TABLE = \
-	contract \
-	engine-core \
-	engine-grpc-server \
-	engine-shared \
-	engine-storage \
-	engine-test-support \
-	engine-wasm-prep \
-	mint \
-	proof-of-stake \
-	standard-payment \
+	grpc/server \
+	grpc/test_support \
+	node \
+	smart_contracts/contract \
 	types
 
 CRATES_WITH_DOCS_RS_MANIFEST_TABLE := $(patsubst %, doc-stable/%, $(CRATES_WITH_DOCS_RS_MANIFEST_TABLE))
@@ -87,7 +81,7 @@ build-contract-rs/%:
 build-system-contract-featured-rs/%:
 	$(CARGO) build \
 	        --release $(filter-out --release, $(CARGO_FLAGS)) \
-	        --manifest-path "contracts/system/$*/Cargo.toml" $(if $(FEATURES),$(if $(filter $(HIGHWAY_CONTRACTS), $*),--features $(FEATURES))) \
+	        --manifest-path "smart_contracts/contracts/system/$*/Cargo.toml" $(if $(FEATURES),$(if $(filter $(HIGHWAY_CONTRACTS), $*),--features $(FEATURES))) \
 	        --target wasm32-unknown-unknown
 
 build-contracts-rs: \
@@ -191,6 +185,7 @@ check-rs: \
 
 .PHONY: check
 check: \
+	build-docs-stable-rs \
 	build \
 	check-format \
 	lint \

node/Cargo.toml

@@ -114,3 +114,6 @@ assets = [
     ["./target/release/casperlabs-node","/usr/bin/casperlabs-node", "755"],
     ["./target/release/casperlabs-client","/usr/bin/casperlabs-client", "755"]
 ]
+
+[package.metadata.docs.rs]
+features = ["no-unstable-features"]

node/src/components/chainspec_handler.rs

@@ -23,6 +23,7 @@ use crate::{
         EffectBuilder, EffectExt, Effects,
     },
 };
+pub(crate) use chainspec::DeployConfig;
 // False positive.
 #[allow(unreachable_pub)]
 pub use chainspec::{Chainspec, GenesisAccount};

node/src/components/chainspec_handler/chainspec.rs

@@ -10,6 +10,7 @@ use std::{
     time::Duration,
 };
 
+use num_traits::Zero;
 use rand::{
     distributions::{Distribution, Standard},
     Rng,
@@ -101,6 +102,19 @@ pub(crate) struct DeployConfig {
     pub(crate) max_ttl: Duration,
     pub(crate) max_dependencies: u8,
     pub(crate) max_block_size: u32,
+    pub(crate) block_gas_limit: u64,
+}
+
+impl Default for DeployConfig {
+    fn default() -> Self {
+        DeployConfig {
+            max_payment_cost: Motes::zero(),
+            max_ttl: Duration::from_millis(86_400_000), // 1 day
+            max_dependencies: 10,
+            max_block_size: 10_485_760,
+            block_gas_limit: 10_000_000_000_000,
+        }
+    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -115,6 +129,19 @@ pub(crate) struct HighwayConfig {
     pub(crate) finality_threshold_percent: u8,
 }
 
+impl Default for HighwayConfig {
+    fn default() -> Self {
+        HighwayConfig {
+            genesis_era_start_timestamp: 1_583_712_000_000,
+            era_duration: Duration::from_millis(604_800_000), // 1 week
+            booking_duration: Duration::from_millis(864_000_000), // 10 days
+            entropy_duration: Duration::from_millis(10_800_000), // 3 hours
+            voting_period_duration: Duration::from_millis(172_800_000), // 2 days
+            finality_threshold_percent: 10,
+        }
+    }
+}
+
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
 // Disallow unknown fields to ensure config files and command-line overrides contain valid keys.
 #[serde(deny_unknown_fields)]
@@ -311,6 +338,7 @@ mod tests {
         );
         assert_eq!(spec.genesis.deploy_config.max_dependencies, 11);
         assert_eq!(spec.genesis.deploy_config.max_block_size, 12);
+        assert_eq!(spec.genesis.deploy_config.block_gas_limit, 13);
 
         assert_eq!(spec.genesis.costs.regular, 13);
         assert_eq!(spec.genesis.costs.div, 14);
@@ -353,9 +381,10 @@ mod tests {
         );
         assert_eq!(upgrade0.new_deploy_config.unwrap().max_dependencies, 36);
         assert_eq!(upgrade0.new_deploy_config.unwrap().max_block_size, 37);
+        assert_eq!(upgrade0.new_deploy_config.unwrap().block_gas_limit, 38);
 
         let upgrade1 = &spec.upgrades[1];
-        assert_eq!(upgrade1.activation_point, ActivationPoint { rank: 38 });
+        assert_eq!(upgrade1.activation_point, ActivationPoint { rank: 39 });
         assert_eq!(upgrade1.protocol_version, Version::from((0, 3, 0)));
         assert!(upgrade1.upgrade_installer_bytes.is_none());
         assert!(upgrade1.upgrade_installer_args.is_none());

node/src/components/chainspec_handler/config.rs

@@ -41,16 +41,12 @@ struct DeployConfig {
     max_ttl_millis: u64,
     max_dependencies: u8,
     max_block_size: u32,
+    block_gas_limit: u64,
 }
 
 impl Default for DeployConfig {
     fn default() -> Self {
-        DeployConfig {
-            max_payment_cost: String::from("0"),
-            max_ttl_millis: 86_400_000, // 1 day
-            max_dependencies: 10,
-            max_block_size: 10_485_760,
-        }
+        chainspec::DeployConfig::default().into()
     }
 }
 
@@ -61,6 +57,7 @@ impl From<chainspec::DeployConfig> for DeployConfig {
             max_ttl_millis: cfg.max_ttl.as_millis() as u64,
             max_dependencies: cfg.max_dependencies,
             max_block_size: cfg.max_block_size,
+            block_gas_limit: cfg.block_gas_limit,
         }
     }
 }
@@ -75,6 +72,7 @@ impl TryFrom<DeployConfig> for chainspec::DeployConfig {
             max_ttl: Duration::from_millis(cfg.max_ttl_millis),
             max_dependencies: cfg.max_dependencies,
             max_block_size: cfg.max_block_size,
+            block_gas_limit: cfg.block_gas_limit,
         })
     }
 }
@@ -118,13 +116,19 @@ struct HighwayConfig {
 
 impl Default for HighwayConfig {
     fn default() -> Self {
+        chainspec::HighwayConfig::default().into()
+    }
+}
+
+impl From<chainspec::HighwayConfig> for HighwayConfig {
+    fn from(cfg: chainspec::HighwayConfig) -> Self {
         HighwayConfig {
-            genesis_era_start_timestamp: 1_583_712_000_000,
-            era_duration_millis: 604_800_000,           // 1 week
-            booking_duration_millis: 864_000_000,       // 10 days
-            entropy_duration_millis: 10_800_000,        // 3 hours
-            voting_period_duration_millis: 172_800_000, // 2 days
-            finality_threshold_percent: 10,
+            genesis_era_start_timestamp: cfg.genesis_era_start_timestamp,
+            era_duration_millis: cfg.era_duration.as_millis() as u64,
+            booking_duration_millis: cfg.booking_duration.as_millis() as u64,
+            entropy_duration_millis: cfg.entropy_duration.as_millis() as u64,
+            voting_period_duration_millis: cfg.voting_period_duration.as_millis() as u64,
+            finality_threshold_percent: cfg.finality_threshold_percent,
         }
     }
 }

node/src/components/consensus.rs

@@ -20,7 +20,7 @@ use crate::{
     components::Component,
     effect::{
         announcements::ConsensusAnnouncement,
-        requests::{BlockExecutorRequest, DeployQueueRequest, NetworkRequest},
+        requests::{BlockExecutorRequest, DeployBufferRequest, NetworkRequest},
         EffectBuilder, EffectExt, Effects,
     },
     types::{ExecutedBlock, ProtoBlock, Timestamp},
@@ -127,7 +127,7 @@ pub trait ReactorEventT<I>:
     From<Event<I>>
     + Send
     + From<NetworkRequest<I, ConsensusMessage>>
-    + From<DeployQueueRequest>
+    + From<DeployBufferRequest>
     + From<ConsensusAnnouncement>
     + From<BlockExecutorRequest>
 {
@@ -137,7 +137,7 @@ impl<REv, I> ReactorEventT<I> for REv where
     REv: From<Event<I>>
         + Send
         + From<NetworkRequest<I, ConsensusMessage>>
-        + From<DeployQueueRequest>
+        + From<DeployBufferRequest>
         + From<ConsensusAnnouncement>
         + From<BlockExecutorRequest>
 {