Calibnet Support

Makefile

@@ -70,6 +70,9 @@ interopnet:
 devnet:
 	cargo build  --manifest-path=forest/Cargo.toml --no-default-features --features "devnet, rocksdb"
 
+calibnet:
+	cargo build --release --manifest-path=forest/Cargo.toml --no-default-features --features "calibnet, rocksdb"
+
 docker-run:
 	docker build -t forest:latest -f ./Dockerfile . && docker run forest
 

forest/Cargo.toml

@@ -70,6 +70,7 @@ rocksdb = ["db/rocksdb", "ipld_blockstore/rocksdb"]
 sled = ["db/sled", "ipld_blockstore/sled"]
 devnet = ["actor/devnet", "networks/devnet", "testnet"]
 interopnet = ["actor/interopnet", "networks/interopnet", "testnet"]
+calibnet = ["networks/calibnet", "actor/calibnet", "testnet"]
 insecure_post = ["chain_sync/insecure_post"]
 testnet = []
 release = []

forest/build.rs

@@ -9,10 +9,12 @@ const RELEASE_TRACK: &str = "unstable";
 #[cfg(feature = "release")]
 const RELEASE_TRACK: &str = "alpha";
 
-const NETWORK: &str = if cfg!(devnet) {
+const NETWORK: &str = if cfg!(feature = "devnet") {
     "devnet"
-} else if cfg!(interopnet) {
+} else if cfg!(feature = "interopnet") {
     "interopnet"
+} else if cfg!(feature = "calibnet") {
+    "calibnet"
 } else {
     "mainnet"
 };

forest/src/daemon.rs

@@ -29,7 +29,7 @@ use std::sync::Arc;
 /// Starts daemon process
 pub(super) async fn start(config: Config) {
     // Set the Address network prefix
-    #[cfg(feature = "testnet")]
+    #[cfg(any(feature = "testnet"))]
     address::NETWORK_DEFAULT
         .set(address::Network::Testnet)
         .unwrap();
@@ -144,6 +144,8 @@ pub(super) async fn start(config: Config) {
         .await
         .unwrap();
 
+    info!("Using network :: {}", network_name);
+
     let validate_height = if config.snapshot { None } else { Some(0) };
     // Sync from snapshot
     if let Some(path) = &config.snapshot_path {

ipld/hamt/src/node.rs

@@ -389,10 +389,11 @@ where
                 let deleted = child_node.rm_value(hashed_key, bit_width, depth + 1, key, store)?;
                 if deleted.is_some() {
                     *child = Pointer::Dirty(std::mem::take(child_node));
+
+                    // Clean to retrieve canonical form
+                    child.clean()?;
                 }
 
-                // Clean to retrieve canonical form
-                child.clean()?;
                 Ok(deleted)
             }
             Pointer::Dirty(n) => {

types/networks/Cargo.toml

@@ -15,4 +15,5 @@ serde_json = "1.0"
 mainnet = []
 interopnet = []
 devnet = []
-conformance = []
+conformance = []
+calibnet = []

types/networks/src/calibnet/mod.rs

@@ -0,0 +1,95 @@
+// Copyright 2019-2022 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::{drand::DRAND_MAINNET, DrandPoint};
+use clock::{ChainEpoch, EPOCH_DURATION_SECONDS};
+use fil_types::NetworkVersion;
+
+/// Default genesis car file bytes.
+pub const DEFAULT_GENESIS: &[u8] = include_bytes!("genesis.car");
+
+/// V1 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_BREEZE_HEIGHT: ChainEpoch = -1;
+
+/// V2 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_SMOKE_HEIGHT: ChainEpoch = -2;
+
+/// V3 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_IGNITION_HEIGHT: ChainEpoch = -3;
+
+/// V4 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_ACTORS_V2_HEIGHT: ChainEpoch = 30;
+
+/// V5 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_TAPE_HEIGHT: ChainEpoch = 60;
+
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_LIFTOFF_HEIGHT: i64 = -5;
+
+/// V6 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_KUMQUAT_HEIGHT: ChainEpoch = 90;
+
+/// V7 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_CALICO_HEIGHT: ChainEpoch = 120;
+
+/// V8 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_PERSIAN_HEIGHT: ChainEpoch = 130;
+
+/// V9 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_ORANGE_HEIGHT: ChainEpoch = 300;
+
+/// Remove burn on window PoSt fork
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_CLAUS_HEIGHT: ChainEpoch = 270;
+
+/// V10 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_ACTORS_V3_HEIGHT: ChainEpoch = 330;
+
+/// V11 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_NORWEGIAN_HEIGHT: ChainEpoch = 360;
+
+/// V12 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_ACTORS_V4_HEIGHT: ChainEpoch = 390;
+
+/// V13 network upgrade
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_HYPERDRIVE_HEIGHT: ChainEpoch = 420;
+
+/// V14 network update
+#[cfg(feature = "calibnet")]
+pub const UPGRADE_ACTORS_V6_HEIGHT: ChainEpoch = 312746;
+
+pub const UPGRADE_PLACEHOLDER_HEIGHT: ChainEpoch = 9999999;
+
+/// Current network version for the network
+pub const NEWEST_NETWORK_VERSION: NetworkVersion = NetworkVersion::V14;
+
+/// Bootstrap peer ids
+pub const DEFAULT_BOOTSTRAP: &[&str] = &[
+    "/dns4/bootstrap-0.calibration.fildev.network/tcp/1347/p2p/12D3KooWJkikQQkxS58spo76BYzFt4fotaT5NpV2zngvrqm4u5ow",
+    "/dns4/bootstrap-1.calibration.fildev.network/tcp/1347/p2p/12D3KooWLce5FDHR4EX4CrYavphA5xS3uDsX6aoowXh5tzDUxJav",
+    "/dns4/bootstrap-2.calibration.fildev.network/tcp/1347/p2p/12D3KooWA9hFfQG9GjP6bHeuQQbMD3FDtZLdW1NayxKXUT26PQZu",
+    "/dns4/bootstrap-3.calibration.fildev.network/tcp/1347/p2p/12D3KooWMHDi3LVTFG8Szqogt7RkNXvonbQYqSazxBx41A5aeuVz",
+];
+
+lazy_static! {
+    pub(super) static ref DRAND_SCHEDULE: [DrandPoint<'static>; 1] = [DrandPoint {
+        height: 0,
+        config: &*DRAND_MAINNET,
+    },];
+}
+
+/// Time, in seconds, between each block.
+pub const BLOCK_DELAY_SECS: u64 = EPOCH_DURATION_SECONDS as u64;

types/networks/src/lib.rs

@@ -15,41 +15,75 @@ mod drand;
     not(feature = "devnet"),
     not(feature = "mainnet"),
     not(feature = "conformance"),
+    not(feature = "calibnet")
 ))]
 compile_error!(
     "No network feature selected. Exactly one of \"mainnet\", \"devnet\", \"interopnet\", or \"conformance\" must be enabled for this crate."
 );
 
 #[cfg(all(
     feature = "mainnet",
-    any(feature = "interopnet", feature = "devnet", feature = "conformance",)
+    any(
+        feature = "interopnet",
+        feature = "devnet",
+        feature = "conformance",
+        feature = "calibnet"
+    )
 ))]
 compile_error!(
-    "\"mainnet\" feature cannot be combined with \"devnet\", \"interopnet\", or \"conformance\"."
+    "\"mainnet\" feature cannot be combined with \"devnet\", \"interopnet\", or \"conformance\", or \"calibnet\"."
 );
 
 #[cfg(all(
     feature = "conformance",
-    any(feature = "interopnet", feature = "devnet", feature = "mainnet",)
+    any(
+        feature = "interopnet",
+        feature = "devnet",
+        feature = "mainnet",
+        feature = "calibnet"
+    )
 ))]
 compile_error!(
-    "\"conformance\" feature cannot be combined with \"devnet\", \"interopnet\", or \"mainnet\"."
+    "\"conformance\" feature cannot be combined with \"devnet\", \"interopnet\", or \"mainnet\", \"calibnet\"."
 );
 
 #[cfg(all(
     feature = "devnet",
-    any(feature = "interopnet", feature = "conformance", feature = "mainnet",)
+    any(
+        feature = "interopnet",
+        feature = "conformance",
+        feature = "mainnet",
+        feature = "calibnet"
+    )
 ))]
 compile_error!(
-    "\"devnet\" feature cannot be combined with \"conformance\", \"interopnet\", or \"mainnet\"."
+    "\"devnet\" feature cannot be combined with \"conformance\", \"interopnet\", or \"mainnet\", \"calibnet\"."
 );
 
 #[cfg(all(
     feature = "interopnet",
-    any(feature = "conformance", feature = "devnet", feature = "mainnet",)
+    any(
+        feature = "conformance",
+        feature = "devnet",
+        feature = "mainnet",
+        feature = "calibnet"
+    )
 ))]
 compile_error!(
-    "\"interopnet\" feature cannot be combined with \"devnet\", \"conformance\", or \"mainnet\"."
+    "\"interopnet\" feature cannot be combined with \"devnet\", \"conformance\", or \"mainnet\", \"calibnet\"."
+);
+
+#[cfg(all(
+    feature = "calibnet",
+    any(
+        feature = "conformance",
+        feature = "devnet",
+        feature = "mainnet",
+        feature = "interopnet"
+    )
+))]
+compile_error!(
+    "\"interopnet\" feature cannot be combined with \"devnet\", \"conformance\", or \"mainnet\", \"interopnet\"."
 );
 
 // Both mainnet and conformance parameters are kept in the 'mainnet' module.
@@ -68,6 +102,11 @@ mod devnet;
 #[cfg(feature = "devnet")]
 pub use self::devnet::*;
 
+#[cfg(feature = "calibnet")]
+mod calibnet;
+#[cfg(feature = "calibnet")]
+pub use self::calibnet::*;
+
 /// Defines the different hard fork parameters.
 struct Upgrade {
     /// When the hard fork will happen