Merge master next into master

introducint breaking changes since 0.6.x family

.travis.yml

@@ -94,6 +94,7 @@ branches:
     # release tags
     - /^v\d+\.\d+\.\d+.*$/
     - master
+    - master-next
 
 notifications:
   email:

appveyor.yml

@@ -73,6 +73,7 @@ branches:
     # Release tags
     - /^v\d+\.\d+\.\d+.*$/
     - master
+    - master-next
 
 notifications:
   - provider: Email

doc/jcli/rest.md

@@ -33,9 +33,28 @@ YAML printed on success
 
 ```yaml
 ---
-blockRecvCnt: 7 # Blocks received by node
-txRecvCnt: 90   # Transactions received by node
-uptime: 2101    # Node uptitme in seconds
+# Number of blocks received by node
+blockRecvCnt: 1102
+# The Epoch and slot Number of the block (optional)
+lastBlockDate: "20.29"
+# Sum of all fee values in all transactions in last block
+lastBlockFees: 534
+# The block hash, it's unique identifier in the blockchain (optional)
+lastBlockHash: b9597b45a402451540e6aabb58f2ee4d65c67953b338e04c52c00aa0886bd1f0
+# The block number, in order, since the block0 (optional)
+lastBlockHeight: 202901
+# Sum of all input values in all transactions in last block
+lastBlockSum: 51604
+# When last block was created, not set if none was created yet (optional)
+lastBlockTime: 2019-08-12T11:20:52.316544007+00:00
+# Number of transactions in last block
+lastBlockTx: 2
+# State of the node
+state: Running
+# Number of transactions received by node
+txRecvCnt: 5440
+# Node uptime in seconds
+uptime: 20032
 ```
 
 ## Whole UTXO

doc/openapi.yaml

@@ -422,16 +422,25 @@ paths:
             application/json:
               schema:
                 type: object
-                required: [blockRecvCnt, lastBlockFees, lastBlockSum, lastBlockTx, txRecvCnt, uptime]
+                required: [blockRecvCnt, lastBlockFees, lastBlockSum, lastBlockTx, state, txRecvCnt, uptime]
                 properties:
                   blockRecvCnt:
                     description: Number of blocks received by node
                     type: integer
                     minimum: 0
+                  lastBlockDate:
+                    description: The Epoch and slot Number of the block
+                    type: string
                   lastBlockFees:
                     description: Sum of all fee values in all transactions in last block
                     type: integer
                     minimum: 0
+                  lastBlockHash:
+                    description: The block hash, it's unique identifier in the blockchain
+                    type: string
+                  lastBlockHeight:
+                    description: The block number, in order, since the block0
+                    type: number
                   lastBlockSum:
                     description: Sum of all input values in all transactions in last block
                     type: integer
@@ -444,6 +453,10 @@ paths:
                     description: Number of transactions in last block
                     type: integer
                     minimum: 0
+                  state:
+                    description: State of the node
+                    type: string
+                    enum: [StartingRestServer, PreparingStorage, PreparingBlock0, Bootstrapping, StartingWorkers, Running]
                   txRecvCnt:
                     description: Number of transactions received by node
                     type: integer
@@ -452,26 +465,17 @@ paths:
                     description: Node uptime in seconds
                     type: integer
                     minimum: 0
-                  lastBlockDate:
-                    description: The Epoch and slot Number of the block.
-                    type: string
-                  lastBlockHeight:
-                    description: The block number, in order, since the block0
-                    type: number
-                    minimum: 0
-                  lastBlockHash:
-                    description: The block hash, it's unique identifier in the blockchain.
-                    type: string
               example: |
                 {
                   "blockRecvCnt": 1102,
+                  "lastBlockDate": "20.29",
                   "lastBlockFees": 534,
+                  "lastBlockHash": "b9597b45a402451540e6aabb58f2ee4d65c67953b338e04c52c00aa0886bd1f0",
+                  "lastBlockHeight": 202901,
                   "lastBlockSum": 51604,
                   "lastBlockTime": "2019-08-12T11:20:52.316544007+00:00",
-                  "lastBlockDate": "20.29",
-                  "lastBlockHeight": 202901,
-                  "lastBlockHash": "b9597b45a402451540e6aabb58f2ee4d65c67953b338e04c52c00aa0886bd1f0",
                   "lastBlockTx": 2,
+                  "state": "Running",
                   "txRecvCnt": 5440,
                   "uptime": 20032
                 }

jcli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jcli"
-version = "0.6.5"
+version = "0.6.999-dev"
 authors = [ "[email protected]" ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/input-output-hk/jormungandr"

jcli/src/jcli_app/transaction/mk_witness.rs

@@ -3,7 +3,7 @@ use chain_core::property::Serialize as _;
 use chain_crypto::{AsymmetricKey, Ed25519Bip32, SecretKey};
 use chain_impl_mockchain::{
     account::SpendingCounter,
-    block::HeaderHash,
+    header::HeaderId,
     transaction::{TransactionSignDataHash, Witness},
 };
 use jcli_app::transaction::Error;
@@ -32,7 +32,7 @@ pub struct MkWitness {
 
     /// the hash of the block0, the first block of the blockchain
     #[structopt(long = "genesis-block-hash", parse(try_from_str))]
-    pub genesis_block_hash: HeaderHash,
+    pub genesis_block_hash: HeaderId,
 
     /// value is mandatory is `--type=account' It is the counter for
     /// every time the account is being utilized.

jormungandr-integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-integration-tests"
-version = "0.6.5"
+version = "0.6.999-dev"
 authors = [ "[email protected]" ]
 edition = "2018"
 

jormungandr-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-lib"
-version = "0.6.5"
+version = "0.6.999-dev"
 authors = ["[email protected]"]
 edition = "2018"
 

jormungandr-lib/src/interfaces/block0_configuration/mod.rs

@@ -18,11 +18,12 @@ pub use self::leader_id::ConsensusLeaderId;
 pub use self::number_of_slots_per_epoch::NumberOfSlotsPerEpoch;
 pub use self::slots_duration::SlotDuration;
 use chain_impl_mockchain::{
-    block::{Block, BlockBuilder, ContentsBuilder},
-    fragment::Fragment,
+    block::{self, Block},
+    fragment::{ContentsBuilder, Fragment},
+    header::{BlockDate, BlockVersion, Header},
 };
 use serde::{Deserialize, Serialize};
-use std::convert::TryFrom as _;
+use std::convert::{Infallible, TryFrom as _};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
@@ -72,8 +73,17 @@ impl Block0Configuration {
             self.blockchain_configuration.clone().into(),
         ));
         content_builder.push_many(self.initial.iter().map(Fragment::from));
-        let builder = BlockBuilder::new(content_builder.into());
-        builder.make_genesis_block()
+        let content = content_builder.into();
+        block::builder(BlockVersion::Genesis, content, |hdr| {
+            let r: Result<Header, Infallible> = Ok(hdr
+                .set_genesis()
+                .set_date(BlockDate::first())
+                .to_unsigned_header()
+                .expect("internal error cannot build unsigned block")
+                .generalize());
+            r
+        })
+        .expect("internal error: block builder cannot return error")
     }
 }
 

jormungandr-scenario-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-scenario-tests"
-version = "0.6.5"
+version = "0.6.999-dev"
 authors = [ "[email protected]" ]
 edition = "2018"
 

jormungandr-scenario-tests/src/node.rs

@@ -1,8 +1,9 @@
 use crate::{scenario::settings::NodeSetting, style, Context, NodeAlias};
 use bawawa::{Control, Process};
 use chain_impl_mockchain::{
-    block::{Block, HeaderHash},
+    block::Block,
     fragment::{Fragment, FragmentId},
+    header::HeaderId,
 };
 use indicatif::ProgressBar;
 use jormungandr_lib::interfaces::{FragmentLog, FragmentStatus};
@@ -59,7 +60,7 @@ pub struct MemPoolCheck {
 }
 
 pub enum NodeBlock0 {
-    Hash(HeaderHash),
+    Hash(HeaderId),
     File(PathBuf),
 }
 
@@ -179,7 +180,7 @@ impl NodeController {
         })
     }
 
-    pub fn get_tip(&self) -> Result<HeaderHash> {
+    pub fn get_tip(&self) -> Result<HeaderId> {
         let hash = self.get("tip")?.text()?;
 
         let hash = hash.parse().chain_err(|| ErrorKind::InvalidHeaderHash)?;
@@ -189,7 +190,7 @@ impl NodeController {
         Ok(hash)
     }
 
-    pub fn get_block(&self, header_hash: &HeaderHash) -> Result<Block> {
+    pub fn get_block(&self, header_hash: &HeaderId) -> Result<Block> {
         use chain_core::mempack::{ReadBuf, Readable as _};
 
         let mut resp = self.get(&format!("block/{}", header_hash))?;

jormungandr-scenario-tests/src/scenario/controller.rs

@@ -2,7 +2,7 @@ use crate::{
     scenario::{settings::Settings, Blockchain, ContextChaCha, ErrorKind, Result, Topology},
     style, MemPoolCheck, Node, NodeBlock0, NodeController, Wallet,
 };
-use chain_impl_mockchain::block::HeaderHash;
+use chain_impl_mockchain::header::HeaderId;
 use indicatif::{MultiProgress, ProgressBar};
 use jormungandr_lib::interfaces::Value;
 use std::{
@@ -29,7 +29,7 @@ pub struct Controller {
     working_directory: PathBuf,
 
     block0_file: PathBuf,
-    block0_hash: HeaderHash,
+    block0_hash: HeaderId,
 
     progress_bar: Arc<MultiProgress>,
     progress_bar_thread: Option<std::thread::JoinHandle<()>>,

jormungandr-scenario-tests/src/scenario/mod.rs

@@ -13,7 +13,8 @@ pub use self::{
     wallet::{Wallet, WalletAlias, WalletType},
 };
 pub use chain_impl_mockchain::{
-    block::{Block, ConsensusVersion, HeaderHash},
+    block::{Block, ConsensusVersion},
+    header::HeaderId,
     value::Value,
 };
 pub use jormungandr_lib::interfaces::{NumberOfSlotsPerEpoch, SlotDuration};

jormungandr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr"
-version = "0.6.5"
+version = "0.6.999-dev"
 authors = [ "[email protected]" ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/input-output-hk/jormungandr"

jormungandr/src/blockcfg/mod.rs

@@ -1,19 +1,23 @@
 pub use network_core::gossip::Gossip;
 
 pub use chain_impl_mockchain::{
-    block::{
-        Block, BlockBuilder, BlockDate, ChainLength, ConsensusVersion, Contents, ContentsBuilder,
-        Epoch, Header, HeaderContentEvalContext, HeaderHash, SlotId,
-    },
+    block::{Block, ConsensusVersion},
     config::{self, Block0Date, ConfigParam},
-    fragment::{ConfigParams, Fragment, FragmentId},
+    fragment::{ConfigParams, Contents, ContentsBuilder, Fragment, FragmentId},
+    header::{
+        BlockDate, BlockVersion, ChainLength, Epoch, Header, HeaderBft, HeaderBftBuilder,
+        HeaderBuilder, HeaderBuilderNew, HeaderContentEvalContext, HeaderGenesisPraos,
+        HeaderGenesisPraosBuilder, HeaderId, HeaderSetConsensusSignature, SlotId,
+    },
     leadership::{BftLeader, GenesisLeader, Leader, LeaderOutput, Leadership},
     ledger::{Ledger, LedgerParameters, LedgerStaticParameters},
     multiverse::Multiverse,
     value::{Value, ValueError},
 };
 use std::time::{Duration, SystemTime};
 
+pub type HeaderHash = HeaderId;
+
 custom_error! {pub Block0Error
     CannotParseEntity{source: config::Error} = "Block0 Initial settings: {source}",
     Malformed{source: Block0Malformed} = "Block0 is invalid or malformed: {source}"

jormungandr/src/blockchain/branch.rs

@@ -144,7 +144,7 @@ impl BranchData {
     }
 
     fn continue_with(&mut self, candidate: Arc<Ref>) -> bool {
-        if &self.reference.hash() == candidate.block_parent_hash() {
+        if self.reference.hash() == candidate.block_parent_hash() {
             let _parent = self.update(candidate);
             true
         } else {

jormungandr/src/blockchain/process.rs

@@ -231,7 +231,7 @@ pub fn process_new_ref(
     tip.clone()
         .get_ref()
         .and_then(move |tip_ref| {
-            if &tip_ref.hash() == candidate.block_parent_hash() {
+            if tip_ref.hash() == candidate.block_parent_hash() {
                 info!(logger, "update current branch tip");
                 A(A(tip.update_ref(candidate).map(|_| true)))
             } else {

jormungandr/src/blockchain/reference.rs

@@ -70,12 +70,12 @@ impl Ref {
     }
 
     /// access the reference's parent hash
-    pub fn block_parent_hash(&self) -> &HeaderHash {
+    pub fn block_parent_hash(&self) -> HeaderHash {
         self.header().block_parent_hash()
     }
 
     /// retrieve the block date of the `Ref`
-    pub fn block_date(&self) -> &BlockDate {
+    pub fn block_date(&self) -> BlockDate {
         self.header().block_date()
     }
 

jormungandr/src/explorer/indexing.rs

@@ -182,7 +182,7 @@ impl ExplorerBlock {
             id,
             transactions,
             chain_length,
-            date: *block.header.block_date(),
+            date: block.header.block_date(),
             parent_hash: block.parent_id(),
             producer,
         }

jormungandr/src/explorer/mod.rs

@@ -233,7 +233,7 @@ impl ExplorerDB {
         let discrimination = self.blockchain_config.discrimination.clone();
 
         multiverse
-            .get(*previous_block)
+            .get(previous_block)
             .map_err(|_: Infallible| unreachable!())
             .and_then(move |maybe_previous_state| match maybe_previous_state {
                 Some(state) => {

jormungandr/src/fragment/selection.rs

@@ -62,7 +62,6 @@ impl FragmentSelectionAlgorithm for OldestFirst {
             match ledger_simulation.apply_fragment(ledger_params, &fragment, metadata) {
                 Ok(ledger_new) => {
                     self.builder.push(fragment);
-
                     total += 1;
                     ledger_simulation = ledger_new;
                 }