5cb8025ddd
* cleanup legacy "3 dot" check (#2625)
* Allow to peers behind NAT to get up to preferred_max connections (#2543)
Allow to peers behind NAT to get up to preffered_max connections
If peer has only outbound connections it's mot likely behind NAT and we should not stop it from getting more outbound connections
* Reduce usage of unwrap in p2p crate (#2627)
Also change store crate a bit
* Simplify (and fix) output_pos cleanup during chain compaction (#2609)
* expose leaf pos iterator
use it for various things in txhashset when iterating over outputs
* fix
* cleanup
* rebuild output_pos index (and clear it out first) when compacting the chain
* fixup tests
* refactor to match on (output, proof) tuple
* add comments to compact() to explain what is going on.
* get rid of some boxing around the leaf_set iterator
* cleanup
* [docs] Add switch commitment documentation (#2526)
* remove references to no-longer existing switch commitment hash
(as switch commitments were removed in ca8447f3bd
and moved into the blinding factor of the Pedersen Commitment)
* some rewording (points vs curves) and fix of small formatting issues
* Add switch commitment documentation
* [docs] Documents in grin repo had translated in Korean. (#2604)
* Start to M/W intro translate in Korean
* translate in Korean
* add korean translation on intro
* table_of_content.md translate in Korean.
* table_of_content_KR.md finish translate in Korean, start to translate State_KR.md
* add state_KR.md & commit some translation in State_KR.md
* WIP stat_KR.md translation
* add build_KR.md && stratum_KR.md
* finish translate stratum_KR.md & table_of_content_KR.md
* rename intro.KR.md to intro_KR.md
* add intro_KR.md file path each language's intro.md
* add Korean translation file path to stratum.md & table_of_contents.md
* fix difference with grin/master
* Fix TxHashSet file filter for Windows. (#2641)
* Fix TxHashSet file filter for Windows.
* rustfmt
* Updating regexp
* Adding in test case
* Display the current download rate rather than the average when syncing the chain (#2633)
* When syncing the chain, calculate the displayed download speed using the current rate from the most recent iteration, rather than the average download speed from the entire syncing process.
* Replace the explicitly ignored variables in the pattern with an implicit ignore
* remove root = true from editorconfig (#2655)
* Add Medium post to intro (#2654)
Spoke to @yeastplume who agreed it makes sense to add the "Grin Transactions Explained, Step-by-Step" Medium post to intro.md
Open for suggestions on a better location.
* add a new configure item for log_max_files (#2601)
* add a new configure item for log_max_files
* rustfmt
* use a constant instead of multiple 32
* rustfmt
* Fix the build warning of deprecated trim_right_matches (#2662)
* [DOC] state.md, build.md and chain directory documents translate in Korean. (#2649)
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* remove some useless md files for translation. this is rearrange set up translation order.
* add dot end of sentence & translate build.md in korean
* remove fast-sync_KR.md
* finish build_KR.md translation
* finish build_KR.md translation
* finish translation state_KR.md & add phrase in state.md to move other language md file
* translate blocks_and_headers.md && chain_sync.md in Korean
* add . in chain_sync.md , translation finished in doc/chain dir.
* fix some miss typos
* Api documentation fixes (#2646)
* Fix the API documentation for Chain Validate (v1/chain/validate). It was documented as a POST, but it is actually a GET request, which can be seen in its handler ChainValidationHandler
* Update the API V1 route list response to include the headers and merkleproof routes. Also clarify that for the chain/outputs route you must specify either byids or byheight to select outputs.
* refactor(ci): reorganize CI related code (#2658)
Break-down the CI related code into smaller more maintainable pieces.
* Specify grin or nanogrins in API docs where applicable (#2642)
* Set Content-Type in API client (#2680)
* Reduce number of unwraps in chain crate (#2679)
* fix: the restart of state sync doesn't work sometimes (#2687)
* let check_txhashset_needed return true on abnormal case (#2684)
* Reduce number of unwwaps in api crate (#2681)
* Reduce number of unwwaps in api crate
* Format use section
* Small QoL improvements for wallet developers (#2651)
* Small changes for wallet devs
* Move create_nonce into Keychain trait
* Replace match by map_err
* Add flag to Slate to skip fee check
* Fix secp dependency
* Remove check_fee flag in Slate
* Add Japanese edition of build.md (#2697)
* catch the panic to avoid peer thread quit early (#2686)
* catch the panic to avoid peer thread quit before taking the chance to ban
* move catch wrapper logic down into the util crate
* log the panic info
* keep txhashset.rs untouched
* remove a warning
* [DOC] dandelion.md, simulation.md ,fast-sync.md and pruning.md documents translate in Korean. (#2678)
* Show response code in API client error message (#2683)
It's hard to investigate what happens when an API client error is
printed out
* Add some better logging for get_outputs_by_id failure states (#2705)
* Switch commitment doc fixes (#2645)
Fix some typos and remove the use of parentheses in a
couple of places to make the reading flow a bit better.
* docs: update/add new README.md badges (#2708)
Replace existing badges with SVG counterparts and add a bunch of new ones.
* Update intro.md (#2702)
Add mention of censoring attack prevented by range proofs
* use sandbox folder for txhashset validation on state sync (#2685)
* use sandbox folder for txhashset validation on state sync
* rustfmt
* use temp directory as the sandbox instead actual db_root txhashset dir
* rustfmt
* move txhashset overwrite to the end of full validation
* fix travis-ci test
* rustfmt
* fix: hashset have 2 folders including txhashset and header
* rustfmt
*
(1)switch to rebuild_header_mmr instead of copy the sandbox header mmr
(2)lock txhashset when overwriting and opening and rebuild
* minor improve on sandbox_dir
* add Japanese edition of state.md (#2703)
* Attempt to fix broken TUI locale (#2713)
Can confirm that on the same machine 1.0.2 TUI looks great and is broken on
the current master. Bump of `cursive` version fixed it for me.
Fixes #2676
* clean the header folder in sandbox (#2716)
* forgot to clean the header folder in sandbox in #2685
* Reduce number of unwraps in servers crate (#2707)
It doesn't include stratum server which is sufficiently changed in 1.1
branch and adapters, which is big enough for a separate PR.
* rustfmt
* change version to beta
264 lines
7.9 KiB
Rust
264 lines
7.9 KiB
Rust
// Copyright 2018 The Grin Developers
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Build a block to mine: gathers transactions from the pool, assembles
|
|
//! them into a block and returns it.
|
|
|
|
use crate::util::RwLock;
|
|
use chrono::prelude::{DateTime, NaiveDateTime, Utc};
|
|
use rand::{thread_rng, Rng};
|
|
use std::sync::Arc;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
|
|
use crate::api;
|
|
use crate::chain;
|
|
use crate::common::types::Error;
|
|
use crate::core::core::verifier_cache::VerifierCache;
|
|
use crate::core::core::{Output, TxKernel};
|
|
use crate::core::libtx::secp_ser;
|
|
use crate::core::{consensus, core, global};
|
|
use crate::keychain::{ExtKeychain, Identifier, Keychain};
|
|
use crate::pool;
|
|
|
|
/// Fees in block to use for coinbase amount calculation
|
|
/// (Duplicated from Grin wallet project)
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
pub struct BlockFees {
|
|
/// fees
|
|
#[serde(with = "secp_ser::string_or_u64")]
|
|
pub fees: u64,
|
|
/// height
|
|
#[serde(with = "secp_ser::string_or_u64")]
|
|
pub height: u64,
|
|
/// key id
|
|
pub key_id: Option<Identifier>,
|
|
}
|
|
|
|
impl BlockFees {
|
|
/// return key id
|
|
pub fn key_id(&self) -> Option<Identifier> {
|
|
self.key_id.clone()
|
|
}
|
|
}
|
|
|
|
/// Response to build a coinbase output.
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
pub struct CbData {
|
|
/// Output
|
|
pub output: Output,
|
|
/// Kernel
|
|
pub kernel: TxKernel,
|
|
/// Key Id
|
|
pub key_id: Option<Identifier>,
|
|
}
|
|
|
|
// Ensure a block suitable for mining is built and returned
|
|
// If a wallet listener URL is not provided the reward will be "burnt"
|
|
// Warning: This call does not return until/unless a new block can be built
|
|
pub fn get_block(
|
|
chain: &Arc<chain::Chain>,
|
|
tx_pool: &Arc<RwLock<pool::TransactionPool>>,
|
|
verifier_cache: Arc<RwLock<dyn VerifierCache>>,
|
|
key_id: Option<Identifier>,
|
|
wallet_listener_url: Option<String>,
|
|
) -> (core::Block, BlockFees) {
|
|
let wallet_retry_interval = 5;
|
|
// get the latest chain state and build a block on top of it
|
|
let mut result = build_block(
|
|
chain,
|
|
tx_pool,
|
|
verifier_cache.clone(),
|
|
key_id.clone(),
|
|
wallet_listener_url.clone(),
|
|
);
|
|
while let Err(e) = result {
|
|
match e {
|
|
self::Error::Chain(c) => match c.kind() {
|
|
chain::ErrorKind::DuplicateCommitment(_) => {
|
|
debug!(
|
|
"Duplicate commit for potential coinbase detected. Trying next derivation."
|
|
);
|
|
}
|
|
_ => {
|
|
error!("Chain Error: {}", c);
|
|
}
|
|
},
|
|
self::Error::WalletComm(_) => {
|
|
error!(
|
|
"Error building new block: Can't connect to wallet listener at {:?}; will retry",
|
|
wallet_listener_url.as_ref().unwrap()
|
|
);
|
|
thread::sleep(Duration::from_secs(wallet_retry_interval));
|
|
}
|
|
ae => {
|
|
warn!("Error building new block: {:?}. Retrying.", ae);
|
|
}
|
|
}
|
|
thread::sleep(Duration::from_millis(100));
|
|
result = build_block(
|
|
chain,
|
|
tx_pool,
|
|
verifier_cache.clone(),
|
|
key_id.clone(),
|
|
wallet_listener_url.clone(),
|
|
);
|
|
}
|
|
return result.unwrap();
|
|
}
|
|
|
|
/// Builds a new block with the chain head as previous and eligible
|
|
/// transactions from the pool.
|
|
fn build_block(
|
|
chain: &Arc<chain::Chain>,
|
|
tx_pool: &Arc<RwLock<pool::TransactionPool>>,
|
|
verifier_cache: Arc<RwLock<dyn VerifierCache>>,
|
|
key_id: Option<Identifier>,
|
|
wallet_listener_url: Option<String>,
|
|
) -> Result<(core::Block, BlockFees), Error> {
|
|
let head = chain.head_header()?;
|
|
|
|
// prepare the block header timestamp
|
|
let mut now_sec = Utc::now().timestamp();
|
|
let head_sec = head.timestamp.timestamp();
|
|
if now_sec <= head_sec {
|
|
now_sec = head_sec + 1;
|
|
}
|
|
|
|
// Determine the difficulty our block should be at.
|
|
// Note: do not keep the difficulty_iter in scope (it has an active batch).
|
|
let difficulty = consensus::next_difficulty(head.height + 1, chain.difficulty_iter()?);
|
|
|
|
// Extract current "mineable" transactions from the pool.
|
|
// If this fails for *any* reason then fallback to an empty vec of txs.
|
|
// This will allow us to mine an "empty" block if the txpool is in an
|
|
// invalid (and unexpected) state.
|
|
let txs = match tx_pool.read().prepare_mineable_transactions() {
|
|
Ok(txs) => txs,
|
|
Err(e) => {
|
|
error!(
|
|
"build_block: Failed to prepare mineable txs from txpool: {:?}",
|
|
e
|
|
);
|
|
warn!("build_block: Falling back to mining empty block.");
|
|
vec![]
|
|
}
|
|
};
|
|
|
|
// build the coinbase and the block itself
|
|
let fees = txs.iter().map(|tx| tx.fee()).sum();
|
|
let height = head.height + 1;
|
|
let block_fees = BlockFees {
|
|
fees,
|
|
key_id,
|
|
height,
|
|
};
|
|
|
|
let (output, kernel, block_fees) = get_coinbase(wallet_listener_url, block_fees)?;
|
|
let mut b = core::Block::from_reward(&head, txs, output, kernel, difficulty.difficulty)?;
|
|
|
|
// making sure we're not spending time mining a useless block
|
|
b.validate(&head.total_kernel_offset, verifier_cache)?;
|
|
|
|
b.header.pow.nonce = thread_rng().gen();
|
|
b.header.pow.secondary_scaling = difficulty.secondary_scaling;
|
|
b.header.timestamp = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(now_sec, 0), Utc);
|
|
|
|
debug!(
|
|
"Built new block with {} inputs and {} outputs, block difficulty: {}, cumulative difficulty {}",
|
|
b.inputs().len(),
|
|
b.outputs().len(),
|
|
difficulty.difficulty,
|
|
b.header.total_difficulty().to_num(),
|
|
);
|
|
|
|
// Now set txhashset roots and sizes on the header of the block being built.
|
|
match chain.set_txhashset_roots(&mut b) {
|
|
Ok(_) => Ok((b, block_fees)),
|
|
Err(e) => {
|
|
match e.kind() {
|
|
// If this is a duplicate commitment then likely trying to use
|
|
// a key that hass already been derived but not in the wallet
|
|
// for some reason, allow caller to retry.
|
|
chain::ErrorKind::DuplicateCommitment(e) => Err(Error::Chain(
|
|
chain::ErrorKind::DuplicateCommitment(e).into(),
|
|
)),
|
|
|
|
// Some other issue, possibly duplicate kernel
|
|
_ => {
|
|
error!("Error setting txhashset root to build a block: {:?}", e);
|
|
Err(Error::Chain(
|
|
chain::ErrorKind::Other(format!("{:?}", e)).into(),
|
|
))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
///
|
|
/// Probably only want to do this when testing.
|
|
///
|
|
fn burn_reward(block_fees: BlockFees) -> Result<(core::Output, core::TxKernel, BlockFees), Error> {
|
|
warn!("Burning block fees: {:?}", block_fees);
|
|
let keychain = ExtKeychain::from_random_seed(global::is_floonet())?;
|
|
let key_id = ExtKeychain::derive_key_id(1, 1, 0, 0, 0);
|
|
let (out, kernel) =
|
|
crate::core::libtx::reward::output(&keychain, &key_id, block_fees.fees, false).unwrap();
|
|
Ok((out, kernel, block_fees))
|
|
}
|
|
|
|
// Connect to the wallet listener and get coinbase.
|
|
// Warning: If a wallet listener URL is not provided the reward will be "burnt"
|
|
fn get_coinbase(
|
|
wallet_listener_url: Option<String>,
|
|
block_fees: BlockFees,
|
|
) -> Result<(core::Output, core::TxKernel, BlockFees), Error> {
|
|
match wallet_listener_url {
|
|
None => {
|
|
// Burn it
|
|
return burn_reward(block_fees);
|
|
}
|
|
Some(wallet_listener_url) => {
|
|
let res = create_coinbase(&wallet_listener_url, &block_fees)?;
|
|
let output = res.output;
|
|
let kernel = res.kernel;
|
|
let key_id = res.key_id;
|
|
let block_fees = BlockFees {
|
|
key_id: key_id,
|
|
..block_fees
|
|
};
|
|
|
|
debug!("get_coinbase: {:?}", block_fees);
|
|
return Ok((output, kernel, block_fees));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Call the wallet API to create a coinbase output for the given block_fees.
|
|
/// Will retry based on default "retry forever with backoff" behavior.
|
|
fn create_coinbase(dest: &str, block_fees: &BlockFees) -> Result<CbData, Error> {
|
|
let url = format!("{}/v1/wallet/foreign/build_coinbase", dest);
|
|
match api::client::post(&url, None, &block_fees) {
|
|
Err(e) => {
|
|
error!(
|
|
"Failed to get coinbase from {}. Is the wallet listening?",
|
|
url
|
|
);
|
|
Err(Error::WalletComm(format!("{}", e)))
|
|
}
|
|
Ok(res) => Ok(res),
|
|
}
|
|
}
|