Fix block validations and add chain export test

Cargo.toml

@@ -25,14 +25,16 @@ members = [
     "ipld",
     "ipld/hamt",
     "ipld/blockstore",
-    "ipld/graphsync",
+    # TODO re-enable graphsync when work continues
+    # "ipld/graphsync",
     "utils/bigint",
     "tests/serialization_tests",
     "tests/conformance_tests",
     "utils/bitfield",
     "utils/test_utils",
     "utils/commcid",
     "utils/json_utils",
+    "utils/genesis",
     "types",
     "key_management",
 ]

Makefile

@@ -38,6 +38,7 @@ clean:
 	@cargo clean -p forest_json_utils
 	@cargo clean -p test_utils
 	@cargo clean -p message_pool
+	@cargo clean -p genesis
 	@echo "Done cleaning."
 
 lint: license clean

blockchain/beacon/Cargo.toml

@@ -11,7 +11,7 @@ features = ["json"]
 ahash = "0.4"
 async-std = { version = "1.6.3", features = ["unstable"] }
 clock = { path = "../../node/clock" }
-bls-signatures = "0.6.0"
+bls-signatures = "0.6.1"
 serde = { version = "1.0", features = ["derive"] }
 encoding = { path = "../../encoding", package = "forest_encoding" }
 sha2 = { version = "0.9", default-features = false }

blockchain/beacon/src/drand.rs

@@ -15,7 +15,8 @@ use std::convert::TryFrom;
 use std::error;
 
 /// Default endpoint for the drand beacon node.
-pub const DEFAULT_DRAND_URL: &str = "https://api.drand.sh";
+// TODO this URL is only valid until smoke fork, should setup schedule for drand upgrade
+pub const DEFAULT_DRAND_URL: &str = "https://pl-us.incentinet.drand.sh";
 
 /// Enviromental Variable to ignore Drand. Lotus parallel is LOTUS_IGNORE_DRAND
 pub const IGNORE_DRAND_VAR: &str = "IGNORE_DRAND";
@@ -74,6 +75,7 @@ pub struct DrandBeacon {
     url: Cow<'static, str>,
 
     pub_key: DrandPublic,
+    /// Interval between beacons, in seconds.
     interval: u64,
     drand_gen_time: u64,
     fil_gen_time: u64,
@@ -163,8 +165,7 @@ impl Beacon for DrandBeacon {
 
     fn max_beacon_round_for_epoch(&self, fil_epoch: ChainEpoch) -> u64 {
         let latest_ts =
-            fil_epoch as u64 * self.fil_round_time + self.fil_gen_time - self.fil_round_time;
-        // TODO: self.interval has to be converted to seconds. Dont know what it is right now
+            ((fil_epoch as u64 * self.fil_round_time) + self.fil_gen_time) - self.fil_round_time;
         (latest_ts - self.drand_gen_time) / self.interval
     }
 }

blockchain/chain/Cargo.toml

@@ -31,7 +31,6 @@ async-std = "1.6.3"
 types = { package = "fil_types", path = "../../types" }
 lazy_static = "1.4"
 
-
 [features]
 json = []
 

blockchain/chain/src/store/chain_store.rs

@@ -748,11 +748,22 @@ where
         );
     };
 
-    let out_add: BigInt = &log2_p << 8;
-    let mut out = ts.weight().to_owned() + out_add;
-    let e_weight: BigInt = ((log2_p * BigInt::from(ts.blocks().len())) * W_RATIO_NUM) << 8;
-    let value: BigInt = e_weight.div_floor(&(BigInt::from(BLOCKS_PER_EPOCH) * W_RATIO_DEN));
-    out += &value;
+    let mut total_j = 0;
+    for b in ts.blocks() {
+        total_j += b
+            .election_proof()
+            .as_ref()
+            .ok_or("Block contained no election proof when calculating weight")?
+            .win_count;
+    }
+
+    let mut out = ts.weight().to_owned();
+    out += &log2_p << 8;
+    let mut e_weight: BigInt = log2_p * W_RATIO_NUM;
+    e_weight <<= 8;
+    e_weight *= total_j;
+    e_weight = e_weight.div_floor(&(BigInt::from(BLOCKS_PER_EPOCH * W_RATIO_DEN)));
+    out += &e_weight;
     Ok(out)
 }
 

blockchain/chain_sync/Cargo.toml

@@ -17,7 +17,7 @@ libp2p = { version = "0.24", default-features = false }
 cid = { package = "forest_cid", path = "../../ipld/cid" }
 ipld_blockstore = { path = "../../ipld/blockstore" }
 chain = { path = "../chain" }
-message = { package = "forest_message", path = "../../vm/message" }
+message = { package = "forest_message", path = "../../vm/message", features = ["proofs"] }
 state_tree = { path = "../../vm/state_tree/" }
 state_manager = { path = "../state_manager/" }
 num-bigint = { path = "../../utils/bigint", package = "forest_bigint" }
@@ -38,7 +38,12 @@ flo_stream = "0.4.0"
 rand = "0.7.3"
 smallvec = "1.1.0"
 actor = { path = "../../vm/actor" }
+interpreter = { path = "../../vm/interpreter/" }
 
 [dev-dependencies]
 test_utils = { version = "0.1.0", path = "../../utils/test_utils/", features = ["test_constructors"] }
 base64 = "0.12.1"
+genesis = { path = "../../utils/genesis", features = ["testing"] }
+pretty_env_logger = "0.4.0"
+forest_car = { path = "../../ipld/car" }
+hex = "0.4"