From 15a42e7817793a68e1cb94f40d4eb0de6e7db7c6 Mon Sep 17 00:00:00 2001
From: c0gent <nsan1129@gmail.com>
Date: Sat, 28 Jul 2018 11:47:55 -0700
Subject: [PATCH] Update hbbft.

---
 Cargo.toml                     |  2 +-
 gdb-node                       | 42 ++++++++++++++++++++++++++++++++++
 run-node                       | 10 +++++---
 src/hydrabadger/hydrabadger.rs |  4 ++--
 4 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 gdb-node

diff --git a/Cargo.toml b/Cargo.toml
index 83f6422..a243885 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,6 @@ version = "*"
 # git = "https://github.com/c0gent/hbbft"
 git = "https://github.com/poanetwork/hbbft"
 # branch = "master"
-branch = "afck-queue-fields"
+branch = "afck-agreement"
 # path = "../hbbft"
 # features = ["serialization-protobuf"]
\ No newline at end of file
diff --git a/gdb-node b/gdb-node
new file mode 100644
index 0000000..23c8090
--- /dev/null
+++ b/gdb-node
@@ -0,0 +1,42 @@
+#/bin/bash
+
+# Starts a Hydrabadger node
+# =========================
+#
+# Optional environment variables:
+#
+# * HYDRABADGER_LOG_ADDTL:
+#
+#   Appends additional logging args (debug, trace, filters, etc.).
+#
+# * HYDRABADGER_RELEASE:
+#
+#   Builds in debug mode if `HYDRABADGER_RELEASE` == `0` or `false`.
+#   Slows down output and makes reading log easier.
+#
+#
+
+let HOST_PORT=300$1
+let PEER_0_PORT=$HOST_PORT-1
+let PEER_1_PORT=$HOST_PORT+1
+
+HYDRABADGER_LOG=peer_node::hydrabadger=error,warn,info,$HYDRABADGER_LOG_ADDTL
+
+if [[ $HYDRABADGER_RELEASE ]]
+then
+    case "$HYDRABADGER_RELEASE" in
+        0) RELEASE="" ;;
+        false) RELEASE="" ;;
+        *) RELEASE="--release" ;;
+    esac
+else
+    RELEASE="--release"
+fi
+
+bash -c "\
+HYDRABADGER_LOG=$HYDRABADGER_LOG gdb -ex=r --args target/release/peer_node \
+    -b localhost:$HOST_PORT \
+    -r localhost:$PEER_0_PORT \
+    -r localhost:$PEER_1_PORT\
+    $2 $3 $4 $5 $6 $7 $8
+"
diff --git a/run-node b/run-node
index 89462d5..2931d16 100755
--- a/run-node
+++ b/run-node
@@ -16,9 +16,13 @@
 #
 #
 
-let HOST_PORT=300$1
-let PEER_0_PORT=$HOST_PORT-1
-let PEER_1_PORT=$HOST_PORT+1
+let HOST_ID=$1
+let PEER_0_ID=$HOST_ID-1
+let PEER_1_ID=$HOST_ID+1
+
+printf -v HOST_PORT "3%03d" $HOST_ID
+printf -v PEER_0_PORT "3%03d" $PEER_0_ID
+printf -v PEER_1_PORT "3%03d" $PEER_1_ID
 
 HYDRABADGER_LOG=peer_node::hydrabadger=error,warn,info,$HYDRABADGER_LOG_ADDTL
 
diff --git a/src/hydrabadger/hydrabadger.rs b/src/hydrabadger/hydrabadger.rs
index 872b4db..9fc0b70 100644
--- a/src/hydrabadger/hydrabadger.rs
+++ b/src/hydrabadger/hydrabadger.rs
@@ -40,12 +40,12 @@ use super::{Error, State, StateDsct, Handler};
 const EXTRA_DELAY_MS: u64 = 0;
 
 const BATCH_SIZE: usize = 200;
-const NEW_TXNS_PER_INTERVAL: usize = 20;
+const NEW_TXNS_PER_INTERVAL: usize = 10;
 const NEW_TXN_INTERVAL_MS: u64 = 2000;
 const TXN_BYTES: usize = 8;
 
 // The minimum number of peers needed to spawn a HB instance.
-const HB_PEER_MINIMUM_COUNT: usize = 3;
+const HB_PEER_MINIMUM_COUNT: usize = 9;