Updated to 1.51 Rust, build and test clean

.gitignore

@@ -3,6 +3,8 @@ target
 /test-lmdb/
 core-blocks
 data-bench
+data-bench2
+tmp
 
 Cargo.lock
 launch.json
@@ -16,3 +18,4 @@ data/
 bitcrust.iml
 
 store/tst-*
+

Cargo.toml

@@ -16,10 +16,8 @@ itertools = "0.5.1"
 memmap = "0.4"
 libc = "0.2.30"
 rand = "0.3"
-ring = "0.12"
-
-serde = "1"
-serde_derive = "1"
+ring = "0.16"
+serde = { version = "1.0", features = ["derive"] }
 toml = "0.4"
 
 slog = { version = "1.3.2", features = ["max_level_trace", "release_max_level_info"] }
@@ -45,3 +43,5 @@ default = []
 [workspace]
 members = [ "bitcrustd", "monitor", "net", "encode-derive", "store", "hashstore"]
 
+
+

bitcrustd/Cargo.toml

@@ -8,15 +8,17 @@ bitcrust-net = {path = "../net"}
 store = {path = "../store"}
 clap = "~2.25"
 simple_logger = "*"
-log = "0.3"
+log = "0.4"
 multiqueue = "~0.3.2"
-ring = "0.12"
+ring = "0.16"
 serde_derive = "1.0"
 serde = "1.0"
 toml = "0.4"
-rusqlite = "~0.11"
+# rusqlite = "~0.11"
+rusqlite = "0.24.2"
 
-serde_json = {path = "../serde_json"}
+# serde_json = {path = "../serde_json"}
+serde_json = "1.0.64"
 
 [dev-dependencies]
 tempfile = "2.2"

bitcrustd/src/config.rs

@@ -5,7 +5,7 @@ use std::io::{Read, Write};
 use std::path::PathBuf;
 
 use clap::{App, Arg, ArgMatches, SubCommand};
-use log::LogLevel;
+use log::Level;
 use ring::{digest, rand, hmac};
 use ring::rand::SecureRandom;
 use toml;
@@ -53,19 +53,19 @@ pub struct ConfigFile {
 }
 
 pub struct Config {
-    pub log_level: LogLevel,
+    pub log_level: Level,
     pub data_dir: PathBuf,
     raw_key: [u8; 32],
-    signing_key: hmac::SigningKey,
+    signing_key: hmac::Key,
 }
 
 impl<'a, 'b> Config {
     pub fn from_args(matches: &ArgMatches) -> Config {
         let log_level = match matches.occurrences_of("debug") {
-            0 => LogLevel::Warn,
-            1 => LogLevel::Info,
-            2 => LogLevel::Debug,
-            3 | _ => LogLevel::Trace,
+            0 => Level::Warn,
+            1 => Level::Info,
+            2 => Level::Debug,
+            3 | _ => Level::Trace,
         };
         let config_file_path: PathBuf = matches.value_of("config").map(|p| PathBuf::from(&p)).unwrap_or_else(|| {
             let mut path = home_dir().expect("Can't figure out where your $HOME is");
@@ -81,7 +81,7 @@ impl<'a, 'b> Config {
             Config::create_default(config_file_path)
         };
 
-        let key = hmac::SigningKey::new(&digest::SHA256, &config_from_file.key);
+        let key = hmac::Key::new(hmac::HMAC_SHA256, &config_from_file.key);
         let data_dir = PathBuf::from(&config_from_file.data_dir);
 
         let mut a: [u8; 32] = [0; 32];
@@ -160,7 +160,7 @@ impl<'a, 'b> Config {
         c
     }
 
-    pub fn key(&self) -> &hmac::SigningKey {
+    pub fn key(&self) -> &hmac::Key {
         &self.signing_key
     }
 }
@@ -170,7 +170,7 @@ impl Clone for Config {
         Config {
             log_level: self.log_level,
             raw_key: self.raw_key,
-            signing_key: hmac::SigningKey::new(&digest::SHA256, &self.raw_key),
+            signing_key: hmac::Key::new(hmac::HMAC_SHA256, &self.raw_key),
             data_dir: self.data_dir.clone()
         }
     }

bitcrustd/src/peer_manager.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 use std::thread;
 
 use multiqueue::{BroadcastReceiver, BroadcastSender, broadcast_queue};
-use rusqlite::{Error, Connection};
+use rusqlite::{Error, Connection, NO_PARAMS};
 
 use bitcrust_net::{NetAddr, Services};
 use client_message::ClientMessage;
@@ -45,7 +45,7 @@ impl PeerManager {
                  \
                       port INTEGER
              );",
-                     &[])
+                   NO_PARAMS)
             .unwrap();
 
         let addrs: HashSet<NetAddr> = {
@@ -54,14 +54,14 @@ impl PeerManager {
                               limit 1000")
                     .unwrap();
 
-            let addrs: HashSet<NetAddr> = stmt.query_map(&[], |row| {
-                    NetAddr {
-                        time: Some(row.get(0)),
-                        services: Services::from(row.get::<_, i64>(1) as u64),
-                        ip: Ipv6Addr::from_str(&row.get::<_, String>(2))
+            let addrs: HashSet<NetAddr> = stmt.query_map(NO_PARAMS, |row| {
+                    Ok( NetAddr {
+                        time: Some(row.get(0).unwrap_or(0u32)),
+                        services: Services::from(row.get::<_, i64>(1).unwrap_or(0i64) as u64),
+                        ip: Ipv6Addr::from_str(&row.get::<_, String>(2).unwrap_or("".to_string()))
                             .unwrap_or(Ipv6Addr::from_str("::").unwrap()),
-                        port: row.get(3),
-                    }
+                        port: row.get(3).unwrap_or(0u16),
+                    })
                 })
                 .unwrap()
                 .filter_map(|l| l.ok())

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("cargo:rustc-link-search=/usr/local/Cellar/bitcoin/0.21.0/lib\n\
+    cargo:rustc-link-lib=dylib=bitcoinconsensus");
+}

contrib/bitcoind.Dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY contrib/bitcoind /usr/src/bitcoind
+
+WORKDIR /usr/src/bitcoind
+
+RUN /bin/bash /usr/src/bitcoind/install.sh dep
+RUN /bin/bash /usr/src/bitcoind/install.sh bitcoind
+RUN /bin/bash /usr/src/bitcoind/install.sh run
+RUN /bin/bash /usr/src/bitcoind/install.sh user
+RUN /bin/bash /usr/src/bitcoind/install.sh conf
+
+WORKDIR /home/bitcoinduser
+
+USER bitcoinduser
+
+CMD ["/usr/local/bin/run.sh"]

contrib/bitcoind/bitcoind.conf

@@ -0,0 +1,97 @@
+#start in background
+daemon=1
+
+#select network -- comment out both for mainnet
+#testnet=1
+#stn=1
+regtest=1
+
+#Required Consensus Rules for Genesis
+excessiveblocksize=10000000000 #10GB
+maxstackmemoryusageconsensus=100000000 #100MB
+
+#Mining
+#biggest block size you want to mine
+blockmaxsize=4000000000 
+blockassembler=journaling #journaling is default as of 1.0.5
+
+#preload mempool
+preload=1
+
+#mempool usage allowance
+maxmempool=8000 #8G
+dbcache=8192 #8G
+
+#Pruning -- Uncomment to trim the chain in an effort to keep disk usage below the figure set
+#prune=100000 #100GB
+
+#orphan transaction storage 
+#blockreconstructionextratxn=200000
+#maxorphantxsize=10000
+
+#transaction options
+#maxsigcachesize=260
+#maxscriptcachesize=260
+#minrelaytxfee=0.00000001
+#mintxfee=0.00000001
+#dustrelayfee=0.00000001
+#blockmintxfee=0.00000001
+#relaypriority=0
+#feefilter=0
+#limitfreerelay=1000
+#maxscriptsizepolicy=500000
+
+#OP Return max size
+#datacarriersize=100000 #Genesis default is UINT32_MAX
+
+#Max number and size of related Child and Parent transactions per block template 
+limitancestorcount=100
+limitdescendantcount=100
+#limitancestorsize=25000000
+#limitdescendantsize=25000000
+
+#connection options
+maxconnections=80
+
+#ZMQ
+zmqpubhashtx=tcp://127.0.0.1:28332
+zmqpubhashblock=tcp://127.0.0.1:28332
+
+#Ports - Leave commented for defaults
+#port=9333
+#rpcport=9332
+
+#rpc settings
+rpcworkqueue=600
+rpcthreads=16
+rpcallowip=0.0.0.0/0 
+rpcuser=appuser
+rpcpassword=abc123
+
+#debug options
+#can be: net, tor,
+#       mempool, http, bench, zmq, db, rpc, addrman, selectcoins,
+#       reindex, cmpctblock, rand, prune, proxy, mempoolrej, libevent,
+#       coindb, leveldb, txnprop, txnsrc, journal, txnval.
+# 1 = all options enabled.
+# 0 = off which is default
+debug=1
+
+#debugexclude to ignore set log items, can be used to keep log file a bit cleaner
+debugexclude=libevent
+debugexclude=leveldb
+debugexclude=zmq
+debugexclude=txnsrc
+debugexclude=net
+
+#shrinkdebugfile=0 # Setting to 1 prevents bitcoind from clearning the log file on restart. 0/off is default
+
+#multi-threaded options
+#threadsperblock=32
+#maxparallelblocks
+#scriptvalidatormaxbatchsize
+#maxparallelblocksperpeer
+maxstdtxvalidationduration=15
+maxcollectedoutpoints=1000000
+maxstdtxnsperthreadratio=10000
+#maxnonstdtxvalidationduration

contrib/bitcoind/install.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+
+decho(){
+    1>&2 echo $@
+}
+
+install_dep(){
+    apt-get update
+    apt-get install -y wget
+}
+
+install_bitcoind(){
+    TMPDIR=$(mktemp --dir)
+    cd $TMPDIR
+    wget https://download.bitcoinsv.io/bitcoinsv/1.0.5/bitcoin-sv-1.0.5-x86_64-linux-gnu.tar.gz
+    sha256sum bitcoin-sv-1.0.5-x86_64-linux-gnu.tar.gz | grep 96f7c56c7ebd4ecb2dcd664297fcf0511169ac33eaf216407ebc49dae2535578
+    tar xvf bitcoin-sv-1.0.5-x86_64-linux-gnu.tar.gz
+    ln -s bitcoin-sv-1.0.5 bitcoin
+    install -m 0755 bitcoin/bin/* /usr/local/bin
+    chmod +x /usr/local/bin/*   
+    rm -rf $TMPDIR
+}
+
+install_conf(){
+    mkdir -p /etc/bitcoind/
+    cp bitcoind.conf /etc/bitcoind/bitcoind.conf
+}
+
+install_run(){
+    install -m 0755 run.sh /usr/local/bin
+}
+
+user_create(){
+    useradd -ms /bin/bash bitcoinduser
+    mkdir /home/bitcoinduser/data
+    chown -R bitcoinduser:bitcoinduser /home/bitcoinduser/data
+}
+
+
+case $1 in
+    dep)
+        ( install_dep )
+    ;;
+    bitcoind)
+        ( install_bitcoind )
+    ;;
+    run)
+        ( install_run )
+    ;;
+    user)
+        ( user_create )
+    ;;
+    conf)
+        ( install_conf )
+    ;;
+esac

contrib/bitcoind/run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+
+decho(){
+    1>&2 echo $@
+}
+
+run_daemon(){
+    exec /usr/local/bin/bitcoind -conf=/etc/bitcoind/bitcoind.conf -datadir=/home/bitcoinduser/data -daemon
+}
+
+run_daemon

contrib/bitcrust.Dockerfile

@@ -0,0 +1,8 @@
+FROM rustlang/rust:nightly as builder
+WORKDIR /usr/src/app
+COPY . .
+# RUN cargo install cargo-travis
+RUN export PATH=$HOME/.cargo/bin:$PATH
+# RUN cargo rustc -- -Awarnings
+RUN cargo build --all --verbose --color always
+# RUN cargo coveralls --exclude-pattern tests/,script/,bitcoin/src/,encode-derive/ --all