Add a seed info field to the genesis header seal

HoOngEe · HoOngEe · commit 87677526d2d8 · 2019-11-27T17:56:44.000+09:00
diff --git a/core/res/tendermint.json b/core/res/tendermint.json
@@ -54,7 +54,8 @@
         "cur_view": "0x0",
         "precommits": [
           "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        ]
+        ],
+        "precommit_bitset": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
       }
     },
     "score": "0x20000",
diff --git a/core/src/scheme/seal.rs b/core/src/scheme/seal.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -15,9 +15,18 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use cjson;
-use primitives::H520;
+use primitives::{H256, H520};
 use rlp::RlpStream;
 
+pub struct SeedInfo {
+    /// Seed signer index in the validator set
+    pub seed_signer_idx: usize,
+    /// Seed hash generated from the vrf
+    pub seed: H256,
+    /// Seed proof
+    pub proof: Vec<u8>,
+}
+
 /// Tendermint seal.
 pub struct Tendermint {
     /// Parent block's view
@@ -26,6 +35,10 @@ pub struct Tendermint {
     pub cur_view: usize,
     /// Precommit seal signatures.
     pub precommits: Vec<H520>,
+    /// Precommit signatures' bitset
+    pub precommit_bitset: Vec<u8>,
+    /// Seed information for randomized leader election
+    pub vrf_seed_info: SeedInfo,
 }
 
 impl From<Tendermint> for Generic {
@@ -53,6 +66,12 @@ impl From<cjson::scheme::Seal> for Seal {
                 prev_view: tender.prev_view.into(),
                 cur_view: tender.cur_view.into(),
                 precommits: tender.precommits.into_iter().map(Into::into).collect(),
+                precommit_bitset: tender.precommit_bitset.into(),
+                vrf_seed_info: SeedInfo {
+                    seed_signer_idx: tender.vrf_seed_info.seed_signer_idx.into(),
+                    seed: tender.vrf_seed_info.seed.into(),
+                    proof: tender.vrf_seed_info.proof.into(),
+                }
             }),
             cjson::scheme::Seal::Generic(g) => Seal::Generic(Generic(g.into())),
         }
diff --git a/json/src/scheme/genesis.rs b/json/src/scheme/genesis.rs
@@ -52,7 +52,7 @@ mod tests {
     use primitives::{H256 as Core256, H520 as Core520};
     use serde_json;
 
-    use super::super::{Seal, TendermintSeal};
+    use super::super::{Seal, SeedInfo, TendermintSeal};
     use super::Genesis;
     use crate::bytes::Bytes;
     use crate::hash::{H256, H520};
@@ -67,7 +67,13 @@ mod tests {
                     "cur_view": "0x0",
                     "precommits": [
                     "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                    ]
+                    ],
+                    "precommit_bitset": "0x0000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000001",
+                    "vrf_seed_info": {
+                        "seed_signer_idx": "0x0",
+                        "seed": "0x0000000000000000000000000000000000000000000000000000000000000001",
+                        "proof": "0x0000001000000000000000000000000000000000000000000000000000000001"
+                    }
                 }
             },
             "author": "tccqyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqhhn9p3",
@@ -83,7 +89,20 @@ mod tests {
                 cur_view: 0x0.into(),
                 precommits: vec![
                     H520(Core520::from("0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")),
-                ]
+                ],
+                precommit_bitset: Bytes::new(vec![
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                ]),
+                vrf_seed_info: SeedInfo {
+                    seed_signer_idx: 0x0.into(),
+                    seed: H256(Core256::from("0x0000000000000000000000000000000000000000000000000000000000000001")),
+                    proof: Bytes::new(vec![
+                        0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                    ])
+                },
             }),
             score: 0x0004_0000_0000u64.into(),
             author: Some(PlatformAddress::from_str("tccqyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqhhn9p3").unwrap()),
diff --git a/json/src/scheme/mod.rs b/json/src/scheme/mod.rs
@@ -38,7 +38,7 @@ pub use self::genesis::Genesis;
 pub use self::null_engine::{NullEngine, NullEngineParams};
 pub use self::params::Params;
 pub use self::scheme::Scheme;
-pub use self::seal::{Seal, TendermintSeal};
+pub use self::seal::{Seal, SeedInfo, TendermintSeal};
 pub use self::shard::Shard;
 pub use self::simple_poa::{SimplePoA, SimplePoAParams};
 pub use self::solo::{Solo, SoloParams};
diff --git a/json/src/scheme/seal.rs b/json/src/scheme/seal.rs
@@ -15,9 +15,19 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::bytes::Bytes;
-use crate::hash::H520;
+use crate::hash::{H256, H520};
 use crate::uint::Uint;
 
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct SeedInfo {
+    /// Seed signer index in the validator set
+    pub seed_signer_idx: Uint,
+    /// Seed hash generated from the vrf
+    pub seed: H256,
+    /// Seed proof
+    pub proof: Bytes,
+}
+
 /// Tendermint seal.
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct TendermintSeal {
@@ -27,6 +37,10 @@ pub struct TendermintSeal {
     pub cur_view: Uint,
     /// Proposal seal signature.
     pub precommits: Vec<H520>,
+    /// Precommit signatures' bitset
+    pub precommit_bitset: Bytes,
+    /// Seed information for randomized leader election
+    pub vrf_seed_info: SeedInfo,
 }
 
 /// Seal variants.
@@ -41,12 +55,12 @@ pub enum Seal {
 
 #[cfg(test)]
 mod tests {
-    use primitives::H520 as Core520;
+    use primitives::{H256 as Core256, H520 as Core520};
     use serde_json;
 
-    use super::{Seal, TendermintSeal};
+    use super::{Seal, SeedInfo, TendermintSeal};
     use crate::bytes::Bytes;
-    use crate::hash::H520;
+    use crate::hash::{H256, H520};
 
     #[test]
     fn seal_deserialization() {
@@ -58,7 +72,13 @@ mod tests {
                 "cur_view": "0x4",
                 "precommits": [
                 "0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"
-                ]
+                ],
+                "precommit_bitset": "0x0000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000001",
+                "vrf_seed_info": {
+                    "seed_signer_idx": "0x0",
+                    "seed": "0x0000000000000000000000000000000000000000000000000000000000000001",
+                    "proof": "0x0000001000000000000000000000000000000000000000000000000000000001"
+                }
             }
         }]"#;
 
@@ -71,7 +91,20 @@ mod tests {
             Seal::Tendermint(TendermintSeal {
                 prev_view: 0x3.into(),
                 cur_view: 0x4.into(),
-                precommits: vec![H520(Core520::from("0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"))]
+                precommits: vec![H520(Core520::from("0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"))],
+                precommit_bitset: Bytes::new(vec![
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                ]),
+                vrf_seed_info: SeedInfo {
+                    seed_signer_idx: 0x0.into(),
+                    seed: H256(Core256::from("0x0000000000000000000000000000000000000000000000000000000000000001")),
+                    proof: Bytes::new(vec![
+                        0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                    ])
+                },
             }),
         ]);
     }
