2018-08-30 12:10:40 +03:00
|
|
|
// 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.
|
|
|
|
|
|
|
|
//! Comments for configuration + injection into output .toml
|
|
|
|
use std::collections::HashMap;
|
|
|
|
|
2018-09-03 14:09:28 +03:00
|
|
|
/// maps entries to Comments that should precede them
|
2018-08-30 12:10:40 +03:00
|
|
|
fn comments() -> HashMap<String, String> {
|
|
|
|
let mut retval = HashMap::new();
|
|
|
|
retval.insert(
|
|
|
|
"[server]".to_string(),
|
|
|
|
"
|
2018-09-05 16:37:37 +03:00
|
|
|
# Generated Server Configuration File for Grin
|
2018-08-30 12:10:40 +03:00
|
|
|
#
|
|
|
|
# When running the grin executable without specifying any command line
|
2018-09-05 16:37:37 +03:00
|
|
|
# arguments, it will look for this file in two places, in the following
|
2018-08-30 12:10:40 +03:00
|
|
|
# order:
|
|
|
|
#
|
|
|
|
# -The working directory
|
|
|
|
# -[user home]/.grin
|
|
|
|
#
|
|
|
|
|
|
|
|
#########################################
|
|
|
|
### SERVER CONFIGURATION ###
|
|
|
|
#########################################
|
|
|
|
|
|
|
|
#Server connection details
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"api_http_addr".to_string(),
|
|
|
|
"
|
2019-01-07 22:42:11 +03:00
|
|
|
#path of TLS certificate file, self-signed certificates are not supported
|
|
|
|
#tls_certificate_file = \"\"
|
|
|
|
#private key for the TLS certificate
|
|
|
|
#tls_certificate_key = \"\"
|
|
|
|
|
2018-08-30 12:10:40 +03:00
|
|
|
#the address on which services will listen, e.g. Transaction Pool
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-09-26 23:38:44 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"api_secret_path".to_string(),
|
|
|
|
"
|
|
|
|
#path of the secret token used by the API to authenticate the calls
|
|
|
|
#comment the it to disable basic auth
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"db_root".to_string(),
|
|
|
|
"
|
|
|
|
#the directory, relative to current, in which the grin blockchain
|
|
|
|
#is stored
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"chain_type".to_string(),
|
|
|
|
"
|
|
|
|
#The chain type, which defines the genesis block and the set of cuckoo
|
2018-09-05 16:37:37 +03:00
|
|
|
#parameters used for mining as well as wallet output coinbase maturity. Can be:
|
2018-08-30 12:10:40 +03:00
|
|
|
#AutomatedTesting - For CI builds and instant blockchain creation
|
|
|
|
#UserTesting - For regular user testing (cuckoo 16)
|
2019-01-30 07:23:23 +03:00
|
|
|
#Floonet - For the long term floonet test network
|
|
|
|
#Mainnet - For mainnet
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"chain_validation_mode".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#the chain validation mode, defines how often (if at all) we
|
2018-08-30 12:10:40 +03:00
|
|
|
#want to run a full chain validation. Can be:
|
|
|
|
#\"EveryBlock\" - run full chain validation when processing each block (except during sync)
|
|
|
|
#\"Disabled\" - disable full chain validation (just run regular block validation)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"archive_mode".to_string(),
|
|
|
|
"
|
|
|
|
#run the node in \"full archive\" mode (default is fast-sync, pruned node)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"skip_sync_wait".to_string(),
|
|
|
|
"
|
|
|
|
#skip waiting for sync on startup, (optional param, mostly for testing)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"run_tui".to_string(),
|
|
|
|
"
|
|
|
|
#whether to run the ncurses TUI. Ncurses must be installed and this
|
|
|
|
#will also disable logging to stdout
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"run_test_miner".to_string(),
|
|
|
|
"
|
|
|
|
#Whether to run a test miner. This is only for developer testing (chaintype
|
|
|
|
#usertesting) at cuckoo 16, and will only mine into the default wallet port.
|
|
|
|
#real mining should use the standalone grin-miner
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"[server.dandelion_config]".to_string(),
|
|
|
|
"
|
|
|
|
#########################################
|
|
|
|
### DANDELION CONFIGURATION ###
|
|
|
|
#########################################
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
2019-03-20 16:08:56 +03:00
|
|
|
"epoch_secs".to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
"
|
2019-03-20 16:08:56 +03:00
|
|
|
#dandelion epoch duration
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
2019-03-20 16:08:56 +03:00
|
|
|
"aggregation_secs".to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
"
|
2019-03-20 16:08:56 +03:00
|
|
|
#dandelion aggregation period in secs
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
2019-03-20 16:08:56 +03:00
|
|
|
"embargo_secs".to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
"
|
2019-03-20 16:08:56 +03:00
|
|
|
#fluff and broadcast after embargo expires if tx not seen on network
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
2019-03-20 16:08:56 +03:00
|
|
|
|
2018-08-30 12:10:40 +03:00
|
|
|
retval.insert(
|
|
|
|
"stem_probability".to_string(),
|
|
|
|
"
|
|
|
|
#dandelion stem probability (stem 90% of the time, fluff 10% of the time)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"[server.p2p_config]".to_string(),
|
|
|
|
"#test miner wallet URL (burns if this doesn't exist)
|
2018-12-29 01:46:21 +03:00
|
|
|
#test_miner_wallet_url = \"http://127.0.0.1:3415\"
|
2018-08-30 12:10:40 +03:00
|
|
|
|
|
|
|
#########################################
|
|
|
|
### SERVER P2P CONFIGURATION ###
|
|
|
|
#########################################
|
|
|
|
#The P2P server details (i.e. the server that communicates with other
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"host".to_string(),
|
|
|
|
"
|
2018-10-23 15:01:19 +03:00
|
|
|
#The interface on which to listen.
|
2018-09-26 23:38:44 +03:00
|
|
|
#0.0.0.0 will listen on all interfaces, allowing others to interact
|
2018-08-30 12:10:40 +03:00
|
|
|
#127.0.0.1 will listen on the local machine only
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"port".to_string(),
|
|
|
|
"
|
|
|
|
#The port on which to listen.
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"seeding_type".to_string(),
|
|
|
|
"
|
2018-10-16 04:25:58 +03:00
|
|
|
#how to seed this server, can be None, List or DNSSeed
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-10-16 04:25:58 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"[server.p2p_config.capabilities]".to_string(),
|
|
|
|
"#If the seeding type is List, the list of peers to connect to can
|
2018-08-30 12:10:40 +03:00
|
|
|
#be specified as follows:
|
2018-12-29 01:46:21 +03:00
|
|
|
#seeds = [\"192.168.0.1:3414\",\"192.168.0.2:3414\"]
|
2018-08-30 12:10:40 +03:00
|
|
|
|
2018-09-12 06:30:24 +03:00
|
|
|
#hardcoded peer lists for allow/deny
|
2018-08-30 12:10:40 +03:00
|
|
|
#will *only* connect to peers in allow list
|
2018-12-29 01:46:21 +03:00
|
|
|
#peers_allow = [\"192.168.0.1:3414\", \"192.168.0.2:3414\"]
|
2018-08-30 12:10:40 +03:00
|
|
|
#will *never* connect to peers in deny list
|
2018-12-29 01:46:21 +03:00
|
|
|
#peers_deny = [\"192.168.0.3:3414\", \"192.168.0.4:3414\"]
|
2018-08-30 12:10:40 +03:00
|
|
|
#a list of preferred peers to connect to
|
2018-12-29 01:46:21 +03:00
|
|
|
#peers_preferred = [\"192.168.0.1:3414\",\"192.168.0.2:3414\"]
|
2018-08-30 12:10:40 +03:00
|
|
|
|
|
|
|
#how long a banned peer should stay banned
|
|
|
|
#ban_window = 10800
|
|
|
|
|
|
|
|
#maximum number of peers
|
|
|
|
#peer_max_count = 25
|
|
|
|
|
|
|
|
#preferred minimum number of peers (we'll actively keep trying to add peers
|
|
|
|
#until we get to at least this number
|
|
|
|
#peer_min_preferred_count = 8
|
|
|
|
|
2018-11-07 12:28:17 +03:00
|
|
|
# 15 = Bit flags for FULL_NODE
|
2018-10-08 15:35:48 +03:00
|
|
|
#This structure needs to be changed internally, to make it more configurable
|
2018-12-31 19:49:05 +03:00
|
|
|
|
2018-12-31 21:00:33 +03:00
|
|
|
# A preferred dandelion_peer, mainly used for testing dandelion
|
2018-12-31 19:49:05 +03:00
|
|
|
# dandelion_peer = \"10.0.0.1:13144\"
|
|
|
|
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-09-12 06:30:24 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"[server.pool_config]".to_string(),
|
|
|
|
"
|
2018-08-30 12:10:40 +03:00
|
|
|
#########################################
|
|
|
|
### MEMPOOL CONFIGURATION ###
|
|
|
|
#########################################
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"accept_fee_base".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#base fee that's accepted into the pool
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"max_pool_size".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#maximum number of transactions allowed in the pool
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
2018-11-05 15:51:52 +03:00
|
|
|
retval.insert(
|
|
|
|
"max_stempool_size".to_string(),
|
|
|
|
"
|
|
|
|
#maximum number of transactions allowed in the stempool
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-11-05 15:51:52 +03:00
|
|
|
);
|
|
|
|
|
2018-11-14 21:22:08 +03:00
|
|
|
retval.insert(
|
|
|
|
"mineable_max_weight".to_string(),
|
|
|
|
"
|
|
|
|
#maximum total weight of transactions that can get selected to build a block
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-11-14 21:22:08 +03:00
|
|
|
);
|
|
|
|
|
2018-08-30 12:10:40 +03:00
|
|
|
retval.insert(
|
|
|
|
"[server.stratum_mining_config]".to_string(),
|
|
|
|
"
|
|
|
|
################################################
|
|
|
|
### STRATUM MINING SERVER CONFIGURATION ###
|
|
|
|
################################################
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"enable_stratum_server".to_string(),
|
|
|
|
"
|
|
|
|
#whether stratum server is enabled
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"stratum_server_addr".to_string(),
|
|
|
|
"
|
|
|
|
#what port and address for the stratum server to listen on
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"attempt_time_per_block".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#the amount of time, in seconds, to attempt to mine on a particular
|
2018-08-30 12:10:40 +03:00
|
|
|
#header before stopping and re-collecting transactions from the pool
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"minimum_share_difficulty".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#the minimum acceptable share difficulty to request from miners
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"wallet_listener_url".to_string(),
|
|
|
|
"
|
|
|
|
#the wallet receiver to which coinbase rewards will be sent
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"burn_reward".to_string(),
|
|
|
|
"
|
|
|
|
#whether to ignore the reward (mostly for testing)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"[logging]".to_string(),
|
|
|
|
"
|
|
|
|
#########################################
|
|
|
|
### LOGGING CONFIGURATION ###
|
|
|
|
#########################################
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"log_to_stdout".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#whether to log to stdout
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"stdout_log_level".to_string(),
|
|
|
|
"
|
2018-10-21 23:30:56 +03:00
|
|
|
#log level for stdout: Error, Warning, Info, Debug, Trace
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"log_to_file".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#whether to log to a file
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"file_log_level".to_string(),
|
|
|
|
"
|
2018-10-21 23:30:56 +03:00
|
|
|
#log level for file: Error, Warning, Info, Debug, Trace
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"log_file_path".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#log file path
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
retval.insert(
|
|
|
|
"log_file_append".to_string(),
|
|
|
|
"
|
2018-09-26 23:38:44 +03:00
|
|
|
#whether to append to the log file (true), or replace it on every run (false)
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-08-30 12:10:40 +03:00
|
|
|
);
|
|
|
|
|
2018-10-21 23:30:56 +03:00
|
|
|
retval.insert(
|
|
|
|
"log_max_size".to_string(),
|
|
|
|
"
|
|
|
|
#maximum log file size in bytes before performing log rotation
|
|
|
|
#comment it to disable log rotation
|
2018-12-08 02:59:40 +03:00
|
|
|
"
|
|
|
|
.to_string(),
|
2018-10-21 23:30:56 +03:00
|
|
|
);
|
|
|
|
|
[1.1.0] Merge master into 1.1.0 (#2720)
* 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 ca8447f3bd49e80578770da841e5fbbac2c23cde
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
2019-04-01 13:47:48 +03:00
|
|
|
retval.insert(
|
|
|
|
"log_max_files".to_string(),
|
|
|
|
"
|
|
|
|
#maximum count of the log files to rotate over
|
|
|
|
"
|
|
|
|
.to_string(),
|
|
|
|
);
|
|
|
|
|
2018-08-30 12:10:40 +03:00
|
|
|
retval
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_key(line: &str) -> String {
|
|
|
|
if line.contains("[") && line.contains("]") {
|
|
|
|
return line.to_owned();
|
|
|
|
} else if line.contains("=") {
|
|
|
|
return line.split("=").collect::<Vec<&str>>()[0].trim().to_owned();
|
|
|
|
} else {
|
|
|
|
return "NOT_FOUND".to_owned();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn insert_comments(orig: String) -> String {
|
|
|
|
let comments = comments();
|
|
|
|
let lines: Vec<&str> = orig.split("\n").collect();
|
|
|
|
let mut out_lines = vec![];
|
|
|
|
for l in lines {
|
|
|
|
let key = get_key(l);
|
|
|
|
if let Some(v) = comments.get(&key) {
|
|
|
|
out_lines.push(v.to_owned());
|
|
|
|
}
|
|
|
|
out_lines.push(l.to_owned());
|
|
|
|
out_lines.push("\n".to_owned());
|
|
|
|
}
|
|
|
|
let mut ret_val = String::from("");
|
|
|
|
for l in out_lines {
|
|
|
|
ret_val.push_str(&l);
|
|
|
|
}
|
|
|
|
ret_val.to_owned()
|
|
|
|
}
|